From a2b6ab6c1d970df56404ee7b7b92d3e08e8abb67 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 14 Jun 2022 18:48:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95--=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=9F=A5=E8=AF=A2(=E8=A7=92=E8=89=B2)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jero/modules/project/enums/ProjectRoleEnum.java  | 2 ++
 .../service/impl/ProjectLawsInventoryEOServiceImpl.java       | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectRoleEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectRoleEnum.java
index 526cbbbc3..4f6ee04d2 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectRoleEnum.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectRoleEnum.java
@@ -15,6 +15,8 @@ public enum ProjectRoleEnum {
     PREHOMODUTY("prehomo确认-责任人","8"),
     VERIFYINITIATOR("验证符合性确认-发起人","9"),
     VERIFYDUTY("验证符合性确认-责任人","10"),
+    MANAGER("验证符合性确认-责任人","11"),
+    ADMIN("系统管理员","12"),
     ;
 
     String name;
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
index 9e52b0c6b..4c65022c5 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
@@ -623,7 +623,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		//if(isProjectRole != Integer.parseInt(ProjectRoleEnum.STUDIO_ENGINEER.getValue())){
 		int isProjectRole = Integer.parseInt(projectLawsInventoryEO.getRoleCode());
 
-		if(isProjectRole != Integer.parseInt(ProjectRoleEnum.STUDIO_ENGINEER.getValue())){
+		if(isProjectRole != Integer.parseInt(ProjectRoleEnum.STUDIO_ENGINEER.getValue())
+				|| isProjectRole != Integer.parseInt(ProjectRoleEnum.MANAGER.getValue())
+				|| isProjectRole != Integer.parseInt(ProjectRoleEnum.ADMIN.getValue())){
 			projectLawsInventoryEOQueryWrapper.and(queryWrapper ->{
 				queryWrapper.eq("regulation_owner_id",currentUser.getId()).
 						or().eq("homologation_engineer_id",currentUser.getId());