From abd77b852e2ba51d76850cd410fe2ce2c70810c0 Mon Sep 17 00:00:00 2001 From: liyawei Date: Tue, 23 Aug 2022 09:49:44 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93-=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=B8=85=E5=8D=95-=E6=89=B9=E9=87=8F=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E8=BF=9B=E5=BA=A6=E5=92=8C=E7=8A=B6=E6=80=81?= =?UTF-8?q?-=E6=A0=A1=E9=AA=8C=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProjectTaskInventoryEOServiceImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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);