From a006450660dbf85906e40600ba80d3b3bba63381 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Wed, 7 Jun 2023 14:27:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A4=E8=AF=81=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E4=BF=AE=E6=94=B9=E8=BF=9B=E5=BA=A6=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ctCertificationInventoryEOServiceImpl.java | 43 ++++++++++--------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index e36ef98e9..5a7b00d80 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -389,27 +389,28 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl0){ if(!allList.contains(dutyPerson)){ - - if(roleCode.equals(com.jero.modules.project.enums.ProjectRoleEnum.STUDIO_ENGINEER.getValue())){ - if(relatedPersonnel.getEngineeringInterfacePerson() != null){ - String engineeringInterfacePerson = dutyPerson+","+relatedPersonnel.getEngineeringInterfacePerson(); - relatedPersonnel.setEngineeringInterfacePerson(engineeringInterfacePerson); - }else { - relatedPersonnel.setEngineeringInterfacePerson(dutyPerson); - } - }else if(roleCode.equals(com.jero.modules.project.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue())){ - if(relatedPersonnel.getEngineerLawSet() != null){ - String engineerLawSet = dutyPerson+","+relatedPersonnel.getEngineerLawSet(); - relatedPersonnel.setEngineerLawSet(engineerLawSet); - }else { - relatedPersonnel.setEngineerLawSet(dutyPerson); - } - }else if(roleCode.equals(com.jero.modules.project.enums.ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue())){ - if(relatedPersonnel.getEngineerAttSet() !=null){ - String engineerAttSet = dutyPerson+","+relatedPersonnel.getEngineerAttSet(); - relatedPersonnel.setEngineerAttSet(engineerAttSet); - }else { - relatedPersonnel.setEngineerAttSet(dutyPerson); + if (StringUtils.isNotEmpty(roleCode)) { + if(roleCode.equals(com.jero.modules.project.enums.ProjectRoleEnum.STUDIO_ENGINEER.getValue())){ + if(relatedPersonnel.getEngineeringInterfacePerson() != null){ + String engineeringInterfacePerson = dutyPerson+","+relatedPersonnel.getEngineeringInterfacePerson(); + relatedPersonnel.setEngineeringInterfacePerson(engineeringInterfacePerson); + }else { + relatedPersonnel.setEngineeringInterfacePerson(dutyPerson); + } + }else if(roleCode.equals(com.jero.modules.project.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue())){ + if(relatedPersonnel.getEngineerLawSet() != null){ + String engineerLawSet = dutyPerson+","+relatedPersonnel.getEngineerLawSet(); + relatedPersonnel.setEngineerLawSet(engineerLawSet); + }else { + relatedPersonnel.setEngineerLawSet(dutyPerson); + } + }else if(roleCode.equals(com.jero.modules.project.enums.ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue())){ + if(relatedPersonnel.getEngineerAttSet() !=null){ + String engineerAttSet = dutyPerson+","+relatedPersonnel.getEngineerAttSet(); + relatedPersonnel.setEngineerAttSet(engineerAttSet); + }else { + relatedPersonnel.setEngineerAttSet(dutyPerson); + } } } }