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 9b1b49fb..a4604827 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 @@ -111,24 +111,24 @@ public class LawsAssessController extends JeroController retrieval(@Validated @RequestBody LawsAssessAddVo lawsAssessAddVo) { - String domesticStandardId = lawsAssessAddVo.getDomesticStandardId(); - String overseasStandardId = lawsAssessAddVo.getOverseasStandardId(); - if (StringUtils.isNotBlank(domesticStandardId) && StringUtils.isNotBlank(overseasStandardId)){ + String projectId = lawsAssessAddVo.getProjectId(); + String standardNumbers = lawsAssessAddVo.getStandardNumber(); + if (StringUtils.isBlank(standardNumbers)){ throw new JeroBootException(ResultCommon.PLEASE_SELECT_DATA); } //查询当前项目已绑定的标准,为了不造成重复绑定 //查询该项目下所有未删除的标准 - List allByProjectIdNotDeleted = lawsAssessService.getAllByProjectIdNotDeleted(lawsAssessAddVo.getProjectId()); + List allByProjectIdNotDeleted = lawsAssessService.getAllByProjectIdNotDeleted(projectId); List allByProjectIdNotDeletedIdList = allByProjectIdNotDeleted.stream().map(LawsAssess::getStandardId).distinct().collect(Collectors.toList()); //查询该项目下所有删除的标准 - List allByProjectIdDeleted = lawsAssessService.getAllByProjectIdDeleted(lawsAssessAddVo.getProjectId()); + List allByProjectIdDeleted = lawsAssessService.getAllByProjectIdDeleted(projectId); List allByProjectIdDeletedIdList = allByProjectIdDeleted.stream().map(LawsAssess::getStandardId).distinct().collect(Collectors.toList()); - Date now = new Date(); List lawsAssesses = new ArrayList<>(); - if (StringUtils.isNotBlank(domesticStandardId)){ - List asList = Arrays.asList(domesticStandardId.split(",")); - for (String id : asList) { + for (String standardNumber : standardNumbers.split(",")) { + LawsDomesticStandard lawsDomesticStandard = lawsDomesticStandardService.queryByStandardNumber(standardNumber); + if (lawsDomesticStandard != null){ + String id = lawsDomesticStandard.getId(); if (allByProjectIdNotDeletedIdList.contains(id)){ //如果已存在跳过新增 continue; @@ -142,7 +142,7 @@ public class LawsAssessController extends JeroController asList = Arrays.asList(overseasStandardId.split(",")); - for (String id : asList) { + LawsOverseasStandard lawsOverseasStandard = lawsOverseasStandardService.queryByStandardNumber(standardNumber); + if (lawsOverseasStandard != null){ + String id = lawsOverseasStandard.getId(); if (allByProjectIdNotDeletedIdList.contains(id)){ //如果已存在跳过新增 continue; @@ -167,8 +167,8 @@ public class LawsAssessController extends JeroController