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 ServiceImpl<Proj
 		for(ProjectRelatedPersonnel relatedPersonnel : projectRelatedPersonnelList){
 			if(allList.size()>0){
 				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);
+							}
 						}
 					}
 				}