巡检点配置-巡检点 删除 逻辑问题处理

@@ -239,10 +239,13 @@ public class InspectionFillGroupFillServiceImpl extends ServiceImpl<InspectionFi
                         fillChoiceQueryWrapper.eq("inspection_fill_id", inspectionFill.getId());
                         fillChoiceQueryWrapper.eq("inspection_fill_id", inspectionFill.getId());
                         List<InspectionFillChoice> list = inspectionFillChoiceService.list(fillChoiceQueryWrapper);
                         List<InspectionFillChoice> list = inspectionFillChoiceService.list(fillChoiceQueryWrapper);
                         if (exist(list,inspectionFillChoiceList)) {
                         if (exist(list,inspectionFillChoiceList)) {
-                            Map<String,Object> removeMap = new HashMap<>();
-                            removeMap.put("inspection_fill_id",fill.getId());
-                            removeMap.put("inspection_fill_group_id",groupId);
-                            removeByMap(removeMap);
+                            // ** sonin：此处问题严重，已修改 **
+                            if (StringUtils.isNotEmpty(fill.getId()) && StringUtils.isNotEmpty(groupId)) {
+                                Map<String,Object> removeMap = new HashMap<>();
+                                removeMap.put("inspection_fill_id",fill.getId());
+                                removeMap.put("inspection_fill_group_id",groupId);
+                                removeByMap(removeMap);
+                            }
                             InspectionFillGroupFill inspectionFillGroupFill = new InspectionFillGroupFill();
                             InspectionFillGroupFill inspectionFillGroupFill = new InspectionFillGroupFill();
                             inspectionFillGroupFill.setInspectionFillGroupId(groupId);
                             inspectionFillGroupFill.setInspectionFillGroupId(groupId);
                             inspectionFillGroupFill.setDepartId(departId);
                             inspectionFillGroupFill.setDepartId(departId);
@@ -259,7 +262,9 @@ public class InspectionFillGroupFillServiceImpl extends ServiceImpl<InspectionFi
                     //删除数据库中不属于inspectionFillIdList集合里面的记录
                     //删除数据库中不属于inspectionFillIdList集合里面的记录
                     queryWrapper = new QueryWrapper();
                     queryWrapper = new QueryWrapper();
                     queryWrapper.eq("inspection_fill_id",fill.getId());
                     queryWrapper.eq("inspection_fill_id",fill.getId());
-                    remove(queryWrapper);
+                    if (StringUtils.isNotEmpty(fill.getId())) {
+                        remove(queryWrapper);
+                    }
                     inspectionFillAndChoiceVO.getFill().setId(null);
                     inspectionFillAndChoiceVO.getFill().setId(null);
                     inspectionFillService.saveInspectionFillAndChoice(inspectionFillAndChoiceVO);
                     inspectionFillService.saveInspectionFillAndChoice(inspectionFillAndChoiceVO);
                     //保存填报项和填报组的关系
                     //保存填报项和填报组的关系