From e34f015c19b716548f2629b575041e6ab865f208 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 2 Jun 2022 16:43:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=9B=B8=E5=85=B3=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98--studio?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectRelatedPersonnelServiceImpl.java   | 23 +++++++++++++++++++
 1 file changed, 23 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 f4b65867d..4345d3303 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
@@ -294,6 +294,15 @@ 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<>();
+		wrapper.in(ProjectLibraryBase::getId,projectId);
+		List<ProjectLibraryBase> list = projectLibraryBaseService.list(wrapper);
+		String studioEngineer = "";
+		if(list.size() != 0){
+			studioEngineer = list.get(0).getStudioEngineer();
+		}
 
 		List<ProjectRelatedPersonnel> projectRelatedPersonnels = new ArrayList<>();
 		if(StringUtils.isNotBlank(dutyTerritory)){
@@ -326,6 +335,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 					}
 				}
 			}
+			userIdList.add(studioEngineer);
 			List<SysUser> sysUserList = new ArrayList<>();
 			if(CollectionUtils.isNotEmpty(userIdList)){
 				sysUserList = sysUserService.querySysUserListByIdList(userIdList);
@@ -371,11 +381,23 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 						}
 					}
 				}
+
+				if (StringUtils.isNotBlank(studioEngineer)) {
+					for (SysUser sysUser : sysUserList) {
+						if (StringUtils.equals(studioEngineer, sysUser.getId())) {
+							Map<String, Object> map = new HashMap<>();
+							map.put("name", sysUser.getUsername());
+							map.put("value", sysUser.getId());
+							studioPersonList.add(map);
+						}
+					}
+				}
 			}
 		}
 		allPersonList.addAll(lawEngineerList);
 		allPersonList.addAll(certificationEngineerList);
 		allPersonList.addAll(engineeringInterfacePersonList);
+		allPersonList.addAll(studioPersonList);
 
 		//把userId相同的用户进行去重。
 		allPersonList = allPersonList.stream().collect(
@@ -404,6 +426,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 		result.put("certificationEngineerList",certificationEngineerList);//认证
 		result.put("engineeringInterfacePersonList",engineeringInterfacePersonList);//接口人
 		result.put("allPersonList",allPersonList);
+		result.put("studioPersonList",studioPersonList);
 //		result.put("lawEngineerList",lawEngineerList);
 //		result.put("certificationEngineerList",certificationEngineerList);
 //		result.put("engineeringInterfacePersonList",engineeringInterfacePersonList);