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