角色切换
This commit is contained in:
+9
-3
@@ -5861,10 +5861,16 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
|
|||||||
List<ProjectRelatedPersonnel> projectRelatedPersonnels = projectRelatedPersonnelService.queryPageList(projectLibraryId);
|
List<ProjectRelatedPersonnel> projectRelatedPersonnels = projectRelatedPersonnelService.queryPageList(projectLibraryId);
|
||||||
List<String> lawEngineerNameList = new ArrayList<>();
|
List<String> lawEngineerNameList = new ArrayList<>();
|
||||||
if(projectRelatedPersonnels.size() != 0){
|
if(projectRelatedPersonnels.size() != 0){
|
||||||
lawEngineerNameList = projectRelatedPersonnels.stream().map(ProjectRelatedPersonnel::getLawEngineerName).collect(Collectors.toList());
|
for (ProjectRelatedPersonnel projectRelatedPersonnel : projectRelatedPersonnels) {
|
||||||
|
String lawEngineerName = projectRelatedPersonnel.getLawEngineerName();
|
||||||
|
if(StringUtils.isNotBlank(lawEngineerName)){
|
||||||
|
lawEngineerName = lawEngineerName.replaceAll(" ","");
|
||||||
|
lawEngineerNameList.addAll(Arrays.asList(lawEngineerName.split(",")));
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if(StringUtils.isNotBlank(certificationEngineerName) && certificationEngineerName.equals(loginUser.getUsername())
|
if((StringUtils.isNotBlank(certificationEngineerName) && certificationEngineerName.contains(loginUser.getUsername()))
|
||||||
&& lawEngineerNameList.contains(loginUser.getUsername())){
|
|| lawEngineerNameList.contains(loginUser.getUsername())){
|
||||||
SysRole sysRole = new SysRole();
|
SysRole sysRole = new SysRole();
|
||||||
sysRole.setRoleCode(com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_AND_HOMOLOGATION_ENGINEER.getValue());
|
sysRole.setRoleCode(com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_AND_HOMOLOGATION_ENGINEER.getValue());
|
||||||
sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_AND_HOMOLOGATION_ENGINEER.getName());
|
sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_AND_HOMOLOGATION_ENGINEER.getName());
|
||||||
|
|||||||
Reference in New Issue
Block a user