From 8f2b5c88024e4475f1c4844bda2b4d2d8306fe50 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 17 Jan 2024 09:52:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=84=8F=E8=A7=81=E6=94=B6?=
 =?UTF-8?q?=E9=9B=86-=E8=AF=84=E4=BC=B0=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectLawsInventoryEOServiceImpl.java    | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

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 70f37a2d8..857f00168 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
@@ -13156,29 +13156,38 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		List<String> userIdList = new ArrayList<>();
 		for (ProjectLawsInventoryEO projectLawsInventoryEO : lawsInventoryEOList) {
 			String dutyTerritory = projectLawsInventoryEO.getDutyTerritory();
+			//每条下的相关责任名单
 			List<ProjectRelatedPersonnel> personnelList = projectRelatedPersonnelService.getPersonnelList(projectLawsInventoryEO.getProjectLibraryId(),null,null, null, null, null, null, null, null);
 			if(ObjectUtils.isNotEmpty(personnelList) && StringUtils.isNotBlank(dutyTerritory)){
-				personnelList = personnelList.stream().filter(e->dutyTerritory.equals(e.getDutyTerritory())).collect(Collectors.toList());
+				//通过每条法规清单的责任领域去过滤相关人员名单
+				personnelList = personnelList.stream().filter(e->dutyTerritory.contains(e.getDutyTerritory())).collect(Collectors.toList());
 				//lawEngineer  engineeringInterfacePerson   engineerLawSet   engineerAttSet
 				List<String> collect1 = personnelList.stream().filter(e -> StringUtils.isNotBlank(e.getLawEngineer())).map(ProjectRelatedPersonnel::getLawEngineer).collect(Collectors.toList());
 				List<String> collect2 = personnelList.stream().filter(e -> StringUtils.isNotBlank(e.getEngineeringInterfacePerson())).map(ProjectRelatedPersonnel::getEngineeringInterfacePerson).collect(Collectors.toList());
 				List<String> collect3 = personnelList.stream().filter(e -> StringUtils.isNotBlank(e.getEngineerLawSet())).map(ProjectRelatedPersonnel::getEngineerLawSet).collect(Collectors.toList());
-				List<String> collect4 = personnelList.stream().filter(e -> StringUtils.isNotBlank(e.getEngineerLawSet())).map(ProjectRelatedPersonnel::getEngineerAttSet).collect(Collectors.toList());
+				List<String> collect4 = personnelList.stream().filter(e -> StringUtils.isNotBlank(e.getEngineerAttSet())).map(ProjectRelatedPersonnel::getEngineerAttSet).collect(Collectors.toList());
 
 				if(ObjectUtils.isNotEmpty(collect1)){
-					userIdList.addAll(collect1);
+					for (String s : collect1) {
+						userIdList.addAll(Arrays.asList(s.split(",")));
+					}
 				}
 				if(ObjectUtils.isNotEmpty(collect2)){
-					userIdList.addAll(collect2);
+					for (String s : collect2) {
+						userIdList.addAll(Arrays.asList(s.split(",")));
+					}
 				}
 				if(ObjectUtils.isNotEmpty(collect3)){
-					userIdList.addAll(collect3);
+					for (String s : collect3) {
+						userIdList.addAll(Arrays.asList(s.split(",")));
+					}
 				}
 				if(ObjectUtils.isNotEmpty(collect4)){
-					userIdList.addAll(collect4);
+					for (String s : collect4) {
+						userIdList.addAll(Arrays.asList(s.split(",")));
+					}
 				}
 			}
-
 		}
 		List<SysUser> sysUserList = new ArrayList<>();
 		if(ObjectUtils.isNotEmpty(userIdList)){