diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java index e9597edc5..0d0641bc4 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java @@ -564,7 +564,9 @@ public class InspectionTaskController extends BladeController { List submitList = dto.getSubmitList(); // List deleteIds = JSONArray.parseArray(data.get("deleteIds").toString(), Long.class); List deleteIds = dto.getDeleteIds(); - + List existIds = new ArrayList<>(); + existIds.addAll(deleteIds); + Long rfpId = dto.getRfpId(); List uniqueNames = submitList.stream().distinct() .map(MesRbFilePreserveSlotEntity::getSlotName) // 提取name字段 .collect(Collectors.toList()); @@ -575,10 +577,11 @@ public class InspectionTaskController extends BladeController { if (null != slot.getId()) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("slot_name", slot.getSlotName()); + queryWrapper.eq("rfp_id", rfpId); // queryWrapper.ne("id", slot.getId()); - if (null != deleteIds && deleteIds.size() > 0) { - deleteIds.add(slot.getId()); - queryWrapper.notIn("id", deleteIds); + if (null != existIds && existIds.size() > 0) { + existIds.add(slot.getId()); + queryWrapper.notIn("id", existIds); } else { queryWrapper.ne("id", slot.getId()); } @@ -589,6 +592,7 @@ public class InspectionTaskController extends BladeController { } else { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("slot_name", slot.getSlotName()); + queryWrapper.eq("rfp_id", rfpId); if (null != deleteIds && deleteIds.size() > 0) { queryWrapper.notIn("id", deleteIds); } @@ -607,7 +611,6 @@ public class InspectionTaskController extends BladeController { BladeUser curUserInfo = AuthUtil.getUser(); // PfUserInfo curUserInfo = (PfUserInfo) ControllerUtils.getCurUserInfo(request); // Long rfpId = data.getLong("rfpId"); - Long rfpId = dto.getRfpId(); service.saveOrEditMes(submitList, deleteIds, curUserInfo, rfpId); return R.status(true);