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> lawEngineerList = new ArrayList<>(); List> certificationEngineerList = new ArrayList<>(); List> engineeringInterfacePersonList = new ArrayList<>(); + List> studioPersonList = new ArrayList<>(); + //项目的studio用户 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(ProjectLibraryBase::getId,projectId); + List list = projectLibraryBaseService.list(wrapper); + String studioEngineer = ""; + if(list.size() != 0){ + studioEngineer = list.get(0).getStudioEngineer(); + } List projectRelatedPersonnels = new ArrayList<>(); if(StringUtils.isNotBlank(dutyTerritory)){ @@ -326,6 +335,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl sysUserList = new ArrayList<>(); if(CollectionUtils.isNotEmpty(userIdList)){ sysUserList = sysUserService.querySysUserListByIdList(userIdList); @@ -371,11 +381,23 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl 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