From 7c019a8d66f40fdc5cec91a94b3ba10f2f8ef929 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Wed, 14 Jun 2023 11:20:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=E6=89=B9=E9=87=8F=E8=AE=BE=E7=BD=AE=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectLawsInventoryEOController.java     |  2 +
 .../ProjectLawsInventoryEOServiceImpl.java    | 43 ++++++++++---------
 2 files changed, 25 insertions(+), 20 deletions(-)

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<ProjectLaws
 		 try {
 			 projectLawsInventoryEOService.setBatch(projectLawsInventoryEO);
 		 } catch (Exception e) {
+			 e.printStackTrace();
+			 log.error("批量设置失败：" + e.getMessage());
 			 if(CutEnum.CN.getValue().equals(cut)){
 				 return Result.error("批量设置失败！");
 			 }else{
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
index 8857dcbce..c8a4de920 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
@@ -4427,29 +4427,16 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 
 
-			String DesdutyId = projectLawsInventoryEOList.get(0).getDesignDutyId();
-			String VerdutyId = projectLawsInventoryEOList.get(0).getVerifyDutyId();
+			String desdutyId = projectLawsInventoryEO.getDesignDutyId();
+			String verdutyId = projectLawsInventoryEO.getVerifyDutyId();
 
 			List<String> 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<ProjectLawsIn
 				dutyTerritoryList = dutyTerritoryList.stream().distinct().collect(Collectors.toList());
 			}
 
+			if (!StringUtils.isEmpty(desdutyId)) {
+				for (ProjectLawsInventoryEO info : infoList) {
+					info.setDesignDutyId(desdutyId);
+				}
+			}
+			if (!StringUtils.isEmpty(verdutyId)) {
+				for (ProjectLawsInventoryEO info : infoList) {
+					info.setVerifyDutyId(verdutyId);
+				}
+			}
+
 //			获取当前的projectLibrartId
-			String projectLibrartId = infoEOList.get(0).getProjectLibraryId();
-			String cut = infoEOList.get(0).getCut();
+			String projectLibrartId = infoList.get(0).getProjectLibraryId();
+			String cut = projectLawsInventoryEO.getCut();
 			Map<String, Object> params = new HashMap<>();
 			params.put("projectLibraryId", projectLibrartId);
 			params.put("userId", currentUser.getId());
@@ -4480,9 +4478,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 				//分别获取当前编辑中的设计符合性和认证符合性责任人
 				List<String> designDutyIdList = new ArrayList<>();
-				designDutyIdList = Arrays.asList(projectLawsInventoryEO1.getDesignDutyId().split(","));
+				if (StringUtils.isNotEmpty(projectLawsInventoryEO1.getDesignDutyId())) {
+					designDutyIdList = Arrays.asList(projectLawsInventoryEO1.getDesignDutyId().split(","));
+				}
+
 				List<String> verifyDutyIdList = new ArrayList<>();
-				verifyDutyIdList = Arrays.asList(projectLawsInventoryEO1.getVerifyDutyId().split(","));
+				if (StringUtils.isNotEmpty(projectLawsInventoryEO1.getVerifyDutyId())) {
+					verifyDutyIdList = Arrays.asList(projectLawsInventoryEO1.getVerifyDutyId().split(","));
+				}
 
 				//allDutyList 为法规工程师中验证符合性和确认符合中的责任人
 				List<String> allDutyList = new ArrayList<>();