From 76f8044d3d3e0de495d0a36737f3ffddfc89a14c Mon Sep 17 00:00:00 2001
From: xiejunyu <xjy19961127>
Date: Wed, 20 Apr 2022 22:12:43 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93=E5=9F=BA=E7=A1=80?=
 =?UTF-8?q?=E8=A1=A8,=E7=9B=B8=E5=85=B3=E4=BA=BA=E5=91=98=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProjectLibraryBaseServiceImpl.java        | 12 +++++-------
 .../impl/ProjectRelatedPersonnelServiceImpl.java   | 14 +++++++++-----
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
index ca28d3a3d..501162bc0 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
@@ -145,10 +145,8 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 		return result;
 	}
 
-	public void disposeData(List<ProjectLibraryBase> records){
-
-
-		for (ProjectLibraryBase projectLibraryBase:records) {
+	public void disposeData(List<ProjectLibraryBase> records) {
+		for (ProjectLibraryBase projectLibraryBase : records) {
 			List<SysUser> sysUsers = new ArrayList<>();
 			//认证工程师多个id查询
 			if (StringUtils.isNotEmpty(projectLibraryBase.getCertificationEngineer())) {
@@ -163,20 +161,20 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 				if (CollectionUtils.isNotEmpty(sysUsers)) {
 					String certificationEngineerId = projectLibraryBase.getCertificationEngineer();
 					String certificationEngineerName = null;
+					StringBuilder certificationName = new StringBuilder();
 
 					for (String data : certificationEngineerIdList) {
 						if (StringUtils.isNotEmpty(certificationEngineerId)) {
 							certificationEngineerName = sysUsers.stream().filter(e -> data.equals(e.getId()))
 									.map(sysUser -> sysUser.getUsername()).collect(Collectors.joining(","));
-
 						}
+						certificationName.append(certificationEngineerName).append(" ");
 					}
-					projectLibraryBase.setCertificationEngineerName(certificationEngineerName);
+					projectLibraryBase.setCertificationEngineerName(certificationName.toString());
 				}
 			}
 		}
 	}
-
 }
 
 
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 b56e030ae..006bf4b48 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
@@ -157,14 +157,15 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 				if(CollectionUtils.isNotEmpty(lawEngineerUsers)) {
 					String lawEngineerId = projectRelatedPersonnel.getLawEngineer();
 					String lawEngineerName = null;
-
+					StringBuilder lawName = new StringBuilder();
 					for (String data : lawEngineerIdList) {
 						if (StringUtils.isNotEmpty(lawEngineerId)) {
 							lawEngineerName = lawEngineerUsers.stream().filter(e -> data.equals(e.getId()))
 									.map(sysUser -> sysUser.getUsername()).collect(Collectors.joining(","));
 						}
+						lawName.append(lawEngineerName).append(" ");
 					}
-					projectRelatedPersonnel.setLawEngineerName(lawEngineerName);
+					projectRelatedPersonnel.setLawEngineerName(lawName.toString());
 				}
 			}
 
@@ -181,14 +182,16 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 				if (CollectionUtils.isNotEmpty(engineeringInterfacePersonUsers)) {
 					String engineeringInterfacePersonId = projectRelatedPersonnel.getEngineeringInterfacePerson();
 					String engineeringInterfacePersonName = null;
+					StringBuilder engineeringName = new StringBuilder();
 
 					for (String data : engineeringInterfacePersonIdList) {
 						if (StringUtils.isNotEmpty(engineeringInterfacePersonId)) {
 							engineeringInterfacePersonName = engineeringInterfacePersonUsers.stream().filter(e -> data.equals(e.getId()))
 									.map(sysUser -> sysUser.getUsername()).collect(Collectors.joining(","));
 						}
+						engineeringName.append(engineeringInterfacePersonName).append(" ");
 					}
-					projectRelatedPersonnel.setEngineeringInterfacePersonName(engineeringInterfacePersonName);
+					projectRelatedPersonnel.setEngineeringInterfacePersonName(engineeringName.toString());
 				}
 			}
 
@@ -205,14 +208,15 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 				if(CollectionUtils.isNotEmpty(certificationEngineerUsers)) {
 					String certificationEngineerId = projectRelatedPersonnel.getCertificationEngineer();
 					String certificationEngineerName = null;
-
+					StringBuilder certificationName = new StringBuilder();
 					for (String data : certificationEngineerIdList) {
 						if (StringUtils.isNotEmpty(certificationEngineerId)) {
 							certificationEngineerName = certificationEngineerUsers.stream().filter(e -> data.equals(e.getId()))
 									.map(sysUser -> sysUser.getUsername()).collect(Collectors.joining(","));
 						}
+						certificationName.append(certificationEngineerName).append(" ");
 					}
-					projectRelatedPersonnel.setCertificationEngineerName(certificationEngineerName);
+					projectRelatedPersonnel.setCertificationEngineerName(certificationName.toString());
 				}
 			}