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

修改法规清单角色报错

Browse Source
This commit is contained in:
高嵩
2023-06-08 11:38:05 +08:00
parent a111d42648
commit 57e94856d9
1 changed files with 42 additions and 46 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
+42 -46
View File
@@ -618,29 +618,27 @@ 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 (!StringUtils.isEmpty(dutyPerson)) { if (StringUtils.isNotEmpty(dutyPerson) && !allList.contains(dutyPerson) && StringUtils.isNotEmpty(roleCode1)) {
if (!allList.contains(dutyPerson)) { if (roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.STUDIO_ENGINEER.getValue())) {
if (roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.STUDIO_ENGINEER.getValue())) { if (relatedPersonnel.getEngineeringInterfacePerson() != null) {
if (relatedPersonnel.getEngineeringInterfacePerson() != null) { String engineeringInterfacePerson = dutyPerson + "," + relatedPersonnel.getEngineeringInterfacePerson();
String engineeringInterfacePerson = dutyPerson + "," + relatedPersonnel.getEngineeringInterfacePerson(); relatedPersonnel.setEngineeringInterfacePerson(engineeringInterfacePerson);
relatedPersonnel.setEngineeringInterfacePerson(engineeringInterfacePerson); } else {
} else { relatedPersonnel.setEngineeringInterfacePerson(dutyPerson);
relatedPersonnel.setEngineeringInterfacePerson(dutyPerson); }
} } else if (roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue())) {
} else if (roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue())) { if (relatedPersonnel.getEngineerLawSet() != null) {
if (relatedPersonnel.getEngineerLawSet() != null) { String engineerLawSet = dutyPerson + "," + relatedPersonnel.getEngineerLawSet();
String engineerLawSet = dutyPerson + "," + relatedPersonnel.getEngineerLawSet(); relatedPersonnel.setEngineerLawSet(engineerLawSet);
relatedPersonnel.setEngineerLawSet(engineerLawSet); } else {
} else { relatedPersonnel.setEngineerLawSet(dutyPerson);
relatedPersonnel.setEngineerLawSet(dutyPerson); }
} } else if (roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue())) {
} else if (roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue())) { if (relatedPersonnel.getEngineerAttSet() != null) {
if (relatedPersonnel.getEngineerAttSet() != null) { String engineerAttSet = dutyPerson + "," + relatedPersonnel.getEngineerAttSet();
String engineerAttSet = dutyPerson + "," + relatedPersonnel.getEngineerAttSet(); relatedPersonnel.setEngineerAttSet(engineerAttSet);
relatedPersonnel.setEngineerAttSet(engineerAttSet); } else {
} else { relatedPersonnel.setEngineerAttSet(dutyPerson);
relatedPersonnel.setEngineerAttSet(dutyPerson);
}
} }
} }
} }
@@ -4558,29 +4556,27 @@ 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 (!StringUtils.isEmpty(dutyPerson)) { if (StringUtils.isNotEmpty(dutyPerson) && !allList.contains(dutyPerson) && StringUtils.isNotEmpty(roleCode1)) {
if (!allList.contains(dutyPerson)) { if (roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.STUDIO_ENGINEER.getValue())) {
if (roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.STUDIO_ENGINEER.getValue())) { if (relatedPersonnel.getEngineeringInterfacePerson() != null) {
if (relatedPersonnel.getEngineeringInterfacePerson() != null) { String engineeringInterfacePerson = dutyPerson + "," + relatedPersonnel.getEngineeringInterfacePerson();
String engineeringInterfacePerson = dutyPerson + "," + relatedPersonnel.getEngineeringInterfacePerson(); relatedPersonnel.setEngineeringInterfacePerson(engineeringInterfacePerson);
relatedPersonnel.setEngineeringInterfacePerson(engineeringInterfacePerson); } else {
} else { relatedPersonnel.setEngineeringInterfacePerson(dutyPerson);
relatedPersonnel.setEngineeringInterfacePerson(dutyPerson); }
} } else if (roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue())) {
} else if (roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue())) { if (relatedPersonnel.getEngineerLawSet() != null) {
if (relatedPersonnel.getEngineerLawSet() != null) { String engineerLawSet = dutyPerson + "," + relatedPersonnel.getEngineerLawSet();
String engineerLawSet = dutyPerson + "," + relatedPersonnel.getEngineerLawSet(); relatedPersonnel.setEngineerLawSet(engineerLawSet);
relatedPersonnel.setEngineerLawSet(engineerLawSet); } else {
} else { relatedPersonnel.setEngineerLawSet(dutyPerson);
relatedPersonnel.setEngineerLawSet(dutyPerson); }
} } else if (roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue())) {
} else if (roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue())) { if (relatedPersonnel.getEngineerAttSet() != null) {
if (relatedPersonnel.getEngineerAttSet() != null) { String engineerAttSet = dutyPerson + "," + relatedPersonnel.getEngineerAttSet();
String engineerAttSet = dutyPerson + "," + relatedPersonnel.getEngineerAttSet(); relatedPersonnel.setEngineerAttSet(engineerAttSet);
relatedPersonnel.setEngineerAttSet(engineerAttSet); } else {
} else { relatedPersonnel.setEngineerAttSet(dutyPerson);
relatedPersonnel.setEngineerAttSet(dutyPerson);
}
} }
} }
} }