1、修改删除会议类型接口，删除类型时，重置参考该类型的会议类型rel_id

2、修改删除纪要模板接口，删除模板时，重置参考该模板的纪要模板的referTemplateId

src/main/java/com/cmeeting/service/impl/MeetTypeServiceImpl.java

@@ -3,6 +3,8 @@ package com.cmeeting.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cmeeting.ad.entity.RobotSecurityUser;
 import com.cmeeting.ad.util.SecurityUtil;
@@ -142,17 +144,14 @@ public class MeetTypeServiceImpl extends ServiceImpl<MeetTypeMapper, MeetType>
     @Override
     public void delete(Long id) {
         // 删除类型
-        int meetingTypeCount = meetTypeMapper.deleteById(id);
-        if (meetingTypeCount == 0) {
-            return;
-        }
+        meetTypeMapper.deleteById(id);
         // 删除模板
-        int templateCount = meetingRecordTemplateMapper.delete(new QueryWrapper<MeetingRecordTemplate>().eq("meeting_type", id));
-        if (templateCount == 0) {
-            return;
-        }
+        meetingRecordTemplateMapper.delete(new LambdaQueryWrapper<MeetingRecordTemplate>().eq(MeetingRecordTemplate::getMeetingType, id));
         // 删除模板的启用数据
-        meetTemplateEnableMapper.delete(new QueryWrapper<MeetTemplateEnable>().eq("meet_type_id", id));
+        meetTemplateEnableMapper.delete(new LambdaQueryWrapper<MeetTemplateEnable>().eq(MeetTemplateEnable::getMeetTypeId, id));
+        // 重置参考该类型的其他会议类型的rel_id为null
+        LambdaUpdateWrapper<MeetType> lambdaUpdate = Wrappers.lambdaUpdate();
+        update(lambdaUpdate.eq(MeetType::getRelId, id).eq(MeetType::getIsDel, false).set(MeetType::getRelId, null));
     }
 
     /**

src/main/java/com/cmeeting/service/impl/MeetingRecordTemplateServiceImpl.java

@@ -6,7 +6,9 @@ import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.IdUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cmeeting.ad.entity.RobotSecurityUser;
@@ -380,7 +382,10 @@ public class MeetingRecordTemplateServiceImpl extends ServiceImpl<MeetingRecordT
         // 删除模板
         baseMapper.deleteById(id);
         // 删除模板启用表
-        meetTemplateEnableMapper.delete(new QueryWrapper<MeetTemplateEnable>().eq("rel_id", id));
+        meetTemplateEnableMapper.delete(new LambdaQueryWrapper<MeetTemplateEnable>().eq(MeetTemplateEnable::getRelId, id));
+        // 重置参考该模板的其他纪要模板的referTemplateId为null
+        LambdaUpdateWrapper<MeetingRecordTemplate> lambdaUpdate = Wrappers.lambdaUpdate();
+        update(lambdaUpdate.eq(MeetingRecordTemplate::getReferTemplateId, id).eq(MeetingRecordTemplate::getIsDel, false).set(MeetingRecordTemplate::getReferTemplateId, null));
     }
 
     /**