From 26d6aad19d4ddfe326df53ce7555f9ab977492b5 Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Mon, 23 May 2022 18:19:42 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E5=B7=A5=E7=A8=8B=E5=B8=88?= =?UTF-8?q?=E5=85=B3=E8=81=94=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProjectRelatedPersonnelServiceImpl.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) 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; }