diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java index 9b8c9ac10..029bd88d1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java @@ -495,20 +495,20 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl msgMap = new HashMap<>(); if ("1".equals(operation)) { - if (! ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue().equals(roleCode)) { + if (! (ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue().equals(roleCode) + || ProjectRoleEnum.REGULATI_AND_HOMOLOGATION_ENGINEER.getValue().equals(roleCode))) { msgMap.put("serialNumber", projectLawsInventoryEO.getSerialNumber()); - + msgMapList.add(msgMap); } } else if ("2".equals(operation)) { - if (!(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue().equals(roleCode) + if (!(ProjectRoleEnum.REGULATI_ENGINEER.getValue().equals(roleCode) || ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue().equals(roleCode) || ProjectRoleEnum.REGULATI_AND_HOMOLOGATION_ENGINEER.getValue().equals(roleCode))) { msgMap.put("serialNumber", projectLawsInventoryEO.getSerialNumber()); - + msgMapList.add(msgMap); } } - msgMapList.add(msgMap); } return getMsg(msgMapList, cut, operation);