From 45c07abab3d161429e370ae3bd0743e496fa3c08 Mon Sep 17 00:00:00 2001
From: cuijiaming <1410452759@qq.com>
Date: Mon, 3 Apr 2023 11:03:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E5=92=8C?=
 =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95=20=20=20=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?/=E6=B7=BB=E5=8A=A0=E6=97=B6=EF=BC=8C=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E6=8E=A5=E5=8F=A3=E4=BA=BA=20=20=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E7=9A=84=E6=98=AF=E7=9B=B8=E5=85=B3=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E5=90=8D=E5=8D=95=E4=B8=AD=E7=9A=843=E5=88=97=E5=B7=A5?=
 =?UTF-8?q?=E7=A8=8B=E6=8E=A5=E5=8F=A3=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectRelatedPersonnelServiceImpl.java   | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java
index 4de2a9337..ac746250e 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java
@@ -470,6 +470,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 		List<Map<String,Object>> lawEngineerList = new ArrayList<>();
 		List<Map<String,Object>> certificationEngineerList = new ArrayList<>();
 		List<Map<String,Object>> engineeringInterfacePersonList = new ArrayList<>();
+
 		List<Map<String,Object>> studioPersonList = new ArrayList<>();
 		//项目的studio用户
 		LambdaQueryWrapper<ProjectLibraryBase> wrapper = new LambdaQueryWrapper<>();
@@ -510,6 +511,19 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 						userIdList.add(engineeringInterfacePerson);
 					}
 				}
+
+				if(StringUtils.isNotBlank(projectRelatedPersonnel.getEngineerLawSet())){
+					String[] engineerLawSetArr = projectRelatedPersonnel.getEngineerLawSet().split(",");
+					for (String engineerLawSet : engineerLawSetArr) {
+						userIdList.add(engineerLawSet);
+					}
+				}
+				if(StringUtils.isNotBlank(projectRelatedPersonnel.getEngineerAttSet())){
+					String[] engineerAttSetArr = projectRelatedPersonnel.getEngineerAttSet().split(",");
+					for (String engineerAttSet : engineerAttSetArr) {
+						userIdList.add(engineerAttSet);
+					}
+				}
 			}
 			userIdList.add(studioEngineer);
 			List<SysUser> sysUserList = new ArrayList<>();
@@ -558,6 +572,33 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 					}
 				}
 
+				if(StringUtils.isNotBlank(projectRelatedPersonnel.getEngineerLawSet())){
+					String[] engineerLawSetArr = projectRelatedPersonnel.getEngineerLawSet().split(",");
+					for (String engineerLawSet : engineerLawSetArr) {
+						for (SysUser sysUser : sysUserList) {
+							if(StringUtils.equals(engineerLawSet,sysUser.getId())){
+								Map<String,Object> map = new HashMap<>();
+								map.put("name",sysUser.getUsername());
+								map.put("value",sysUser.getId());
+								engineeringInterfacePersonList.add(map);
+							}
+						}
+					}
+				}
+				if(StringUtils.isNotBlank(projectRelatedPersonnel.getEngineerAttSet())){
+					String[] engineerAttSetArr = projectRelatedPersonnel.getEngineerAttSet().split(",");
+					for (String engineerAttSet : engineerAttSetArr) {
+						for (SysUser sysUser : sysUserList) {
+							if(StringUtils.equals(engineerAttSet,sysUser.getId())){
+								Map<String,Object> map = new HashMap<>();
+								map.put("name",sysUser.getUsername());
+								map.put("value",sysUser.getId());
+								engineeringInterfacePersonList.add(map);
+							}
+						}
+					}
+				}
+
 				if (StringUtils.isNotBlank(studioEngineer)) {
 					for (SysUser sysUser : sysUserList) {
 						if (StringUtils.equals(studioEngineer, sysUser.getId())) {