法规清单和认证清单 编辑/添加时,选择工程接口人 获取的是相关人员名单中的3列工程接口人

This commit is contained in:
cuijiaming
2023-04-03 11:03:02 +08:00
parent 874dafe516
commit 45c07abab3
@@ -470,6 +470,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
List<Map<String,Object>> lawEngineerList = new ArrayList<>();
List<Map<String,Object>> certificationEngineerList = new ArrayList<>();
List<Map<String,Object>> engineeringInterfacePersonList = new ArrayList<>();
List<Map<String,Object>> studioPersonList = new ArrayList<>();
//项目的studio用户
LambdaQueryWrapper<ProjectLibraryBase> wrapper = new LambdaQueryWrapper<>();
@@ -510,6 +511,19 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
userIdList.add(engineeringInterfacePerson);
}
}
if(StringUtils.isNotBlank(projectRelatedPersonnel.getEngineerLawSet())){
String[] engineerLawSetArr = projectRelatedPersonnel.getEngineerLawSet().split(",");
for (String engineerLawSet : engineerLawSetArr) {
userIdList.add(engineerLawSet);
}
}
if(StringUtils.isNotBlank(projectRelatedPersonnel.getEngineerAttSet())){
String[] engineerAttSetArr = projectRelatedPersonnel.getEngineerAttSet().split(",");
for (String engineerAttSet : engineerAttSetArr) {
userIdList.add(engineerAttSet);
}
}
}
userIdList.add(studioEngineer);
List<SysUser> sysUserList = new ArrayList<>();
@@ -558,6 +572,33 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
}
}
if(StringUtils.isNotBlank(projectRelatedPersonnel.getEngineerLawSet())){
String[] engineerLawSetArr = projectRelatedPersonnel.getEngineerLawSet().split(",");
for (String engineerLawSet : engineerLawSetArr) {
for (SysUser sysUser : sysUserList) {
if(StringUtils.equals(engineerLawSet,sysUser.getId())){
Map<String,Object> map = new HashMap<>();
map.put("name",sysUser.getUsername());
map.put("value",sysUser.getId());
engineeringInterfacePersonList.add(map);
}
}
}
}
if(StringUtils.isNotBlank(projectRelatedPersonnel.getEngineerAttSet())){
String[] engineerAttSetArr = projectRelatedPersonnel.getEngineerAttSet().split(",");
for (String engineerAttSet : engineerAttSetArr) {
for (SysUser sysUser : sysUserList) {
if(StringUtils.equals(engineerAttSet,sysUser.getId())){
Map<String,Object> map = new HashMap<>();
map.put("name",sysUser.getUsername());
map.put("value",sysUser.getId());
engineeringInterfacePersonList.add(map);
}
}
}
}
if (StringUtils.isNotBlank(studioEngineer)) {
for (SysUser sysUser : sysUserList) {
if (StringUtils.equals(studioEngineer, sysUser.getId())) {