diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java index ae498ef27..d3a21eb4f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java @@ -303,6 +303,8 @@ public class ProjectLawsInventoryEOController extends JeroController dutyTerritoryList = new ArrayList<>(); //获取批量设置中责任领域 - String dutyTerritory = projectLawsInventoryEOList.get(0).getDutyTerritory(); + String dutyTerritory = projectLawsInventoryEO.getDutyTerritory(); if (!StringUtils.isEmpty(dutyTerritory)) { for (ProjectLawsInventoryEO info : infoList) { info.setDutyTerritory(dutyTerritory); } - } - if (!StringUtils.isEmpty(DesdutyId)) { - for (ProjectLawsInventoryEO info : infoList) { - info.setDesignDutyId(DesdutyId); - } - } - if (!StringUtils.isEmpty(VerdutyId)) { - for (ProjectLawsInventoryEO info : infoList) { - info.setVerifyDutyId(VerdutyId); - } - } - - if (!StringUtils.isEmpty(dutyTerritory)) { dutyTerritoryList = Arrays.asList(dutyTerritory.split(",")); dutyTerritoryList = dutyTerritoryList.stream().distinct().collect(Collectors.toList()); } else { @@ -4461,9 +4448,20 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl params = new HashMap<>(); params.put("projectLibraryId", projectLibrartId); params.put("userId", currentUser.getId()); @@ -4480,9 +4478,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl designDutyIdList = new ArrayList<>(); - designDutyIdList = Arrays.asList(projectLawsInventoryEO1.getDesignDutyId().split(",")); + if (StringUtils.isNotEmpty(projectLawsInventoryEO1.getDesignDutyId())) { + designDutyIdList = Arrays.asList(projectLawsInventoryEO1.getDesignDutyId().split(",")); + } + List verifyDutyIdList = new ArrayList<>(); - verifyDutyIdList = Arrays.asList(projectLawsInventoryEO1.getVerifyDutyId().split(",")); + if (StringUtils.isNotEmpty(projectLawsInventoryEO1.getVerifyDutyId())) { + verifyDutyIdList = Arrays.asList(projectLawsInventoryEO1.getVerifyDutyId().split(",")); + } //allDutyList 为法规工程师中验证符合性和确认符合中的责任人 List allDutyList = new ArrayList<>();