认证工程师关联查询修改

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java

@@ -1046,23 +1046,28 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 		QueryWrapper<ProjectRelatedPersonnel> queryWrapper = new QueryWrapper<>();
 		List<ProjectRelatedPersonnel> list = list(queryWrapper.eq("project_id",projectId));
 
-//		List<String> certificationEngineerIdList = list.stream().map(e -> e.getCertificationEngineer()).collect(Collectors.toList());
 
 		//查询基础表认证工程师的值
 		QueryWrapper<ProjectLibraryBase> baseQueryWrapper = new QueryWrapper<>();
 		List<ProjectLibraryBase> baseDataList = projectLibraryBaseService.list(baseQueryWrapper.eq("id", projectId));
 		String baseCertificationEngineer = baseDataList.get(0).getCertificationEngineer();
-//		List<ProjectRelatedPersonnel> certificationEngineerUsers = new ArrayList<>();//认证工程师非空
 
 		if(StringUtils.isNotBlank(baseCertificationEngineer)) {
 			for (ProjectRelatedPersonnel projectRelatedPersonnel : list) {
-				if (StringUtils.isBlank(projectRelatedPersonnel.getCertificationEngineer())) {
 					projectRelatedPersonnel.setCertificationEngineer(baseCertificationEngineer);
-				}
 			}
 		}
 		disposeData(list);
-		return list;
+		List<ProjectRelatedPersonnel> certificationEngineerList = new ArrayList<>();
+
+		for(ProjectRelatedPersonnel personnel : list){
+			ProjectRelatedPersonnel relatedPersonnel =new ProjectRelatedPersonnel();
+			relatedPersonnel.setCertificationEngineer(personnel.getCertificationEngineer());
+			relatedPersonnel.setCertificationEngineerName(personnel.getCertificationEngineerName());
+			certificationEngineerList.add(relatedPersonnel);
+		}
+		certificationEngineerList = certificationEngineerList.stream().distinct().collect(Collectors.toList());
+		return certificationEngineerList;
 	}