diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsAssessController.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsAssessController.java index e1fa021e..9cb7094b 100644 --- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsAssessController.java +++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsAssessController.java @@ -167,14 +167,15 @@ public class LawsAssessController extends JeroController copy(@Validated @RequestBody LawsAssessAddVo lawsAssessAddVo) { + String projectId = lawsAssessAddVo.getProjectId(); String copyProjectId = lawsAssessAddVo.getCopyProjectId(); if (StringUtils.isBlank(copyProjectId)){ throw new JeroBootException(ResultCommon.PLEASE_SELECT_DATA); } Date now = new Date(); List lawsAssesses = new ArrayList<>(); - List allByProjectIdNotDeleted = lawsAssessService.getAllByProjectIdNotDeleted(lawsAssessAddVo.getProjectId()); - List allByProjectIdDeleted = lawsAssessService.getAllByProjectIdDeleted(lawsAssessAddVo.getProjectId()); + List allByProjectIdNotDeleted = lawsAssessService.getAllByProjectIdNotDeleted(projectId); + List allByProjectIdDeleted = lawsAssessService.getAllByProjectIdDeleted(projectId); List allByProjectIdNotDeletedIdList = allByProjectIdNotDeleted.stream().map(LawsAssess::getStandardId).distinct().collect(Collectors.toList()); List allByProjectIdDeletedIdList = allByProjectIdDeleted.stream().map(LawsAssess::getStandardId).distinct().collect(Collectors.toList()); //获取要拷贝项目的未删除标准 @@ -194,13 +195,14 @@ public class LawsAssessController extends JeroController(); } + List projectIdList = Arrays.asList(projectId.split(",")); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(LawsAssess::getProjectId, projectId); + wrapper.in(LawsAssess::getProjectId, projectIdList); wrapper.eq(LawsAssess::getDelFlag, CommonConstant.DEL_FLAG_0.toString()); return list(wrapper); }