WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug67953修改

Browse Source
This commit is contained in:
cuijiaming
2023-04-07 14:21:03 +08:00
parent 8a4cf1dd24
commit fcd79b7499
1 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+23 -22
View File
@@ -614,32 +614,33 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
if(allList.size()>0){ if(allList.size()>0){
for(String allDuty : allDutyList){ for(String allDuty : allDutyList){
String dutyPerson = allDuty; String dutyPerson = allDuty;
if(!allList.contains(dutyPerson)){ if(!StringUtils.isEmpty(dutyPerson)){
if(roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.STUDIO_ENGINEER.getValue())){ if(!allList.contains(dutyPerson)){
if(relatedPersonnel.getEngineeringInterfacePerson() != null){ if(roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.STUDIO_ENGINEER.getValue())){
String engineeringInterfacePerson = dutyPerson+","+relatedPersonnel.getEngineeringInterfacePerson(); if(relatedPersonnel.getEngineeringInterfacePerson() != null){
relatedPersonnel.setEngineeringInterfacePerson(engineeringInterfacePerson); String engineeringInterfacePerson = dutyPerson+","+relatedPersonnel.getEngineeringInterfacePerson();
}else { relatedPersonnel.setEngineeringInterfacePerson(engineeringInterfacePerson);
relatedPersonnel.setEngineeringInterfacePerson(dutyPerson); }else {
} relatedPersonnel.setEngineeringInterfacePerson(dutyPerson);
}else if(roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue())){ }
if(relatedPersonnel.getEngineerLawSet() != null){ }else if(roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue())){
String engineerLawSet = dutyPerson+","+relatedPersonnel.getEngineerLawSet(); if(relatedPersonnel.getEngineerLawSet() != null){
relatedPersonnel.setEngineerLawSet(engineerLawSet); String engineerLawSet = dutyPerson+","+relatedPersonnel.getEngineerLawSet();
}else { relatedPersonnel.setEngineerLawSet(engineerLawSet);
relatedPersonnel.setEngineerLawSet(dutyPerson); }else {
} relatedPersonnel.setEngineerLawSet(dutyPerson);
}else if(roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue())){ }
if(relatedPersonnel.getEngineerAttSet() !=null){ }else if(roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue())){
String engineerAttSet = dutyPerson+","+relatedPersonnel.getEngineerAttSet(); if(relatedPersonnel.getEngineerAttSet() !=null){
relatedPersonnel.setEngineerAttSet(engineerAttSet); String engineerAttSet = dutyPerson+","+relatedPersonnel.getEngineerAttSet();
}else { relatedPersonnel.setEngineerAttSet(engineerAttSet);
relatedPersonnel.setEngineerAttSet(dutyPerson); }else {
relatedPersonnel.setEngineerAttSet(dutyPerson);
}
} }
} }
} }
} }
} }
} }