From 1ce9e4768f15a262ecf6f8cd7bc7bf800f4db61b Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 28 Sep 2023 10:35:17 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?=E5=A2=9E=E5=88=A0=E6=94=B9=E7=9A=84=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ctCertificationDirectoryEOServiceImpl.java | 25 ++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationDirectoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationDirectoryEOServiceImpl.java
index 014883c0d..31bce9294 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationDirectoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationDirectoryEOServiceImpl.java
@@ -59,7 +59,7 @@ public class ProjectCertificationDirectoryEOServiceImpl extends ServiceImpl<Proj
 	 */
 	@Override
     public void add(ProjectCertificationDirectoryEO projectCertificationDirectoryEO) {
-		checkData(projectCertificationDirectoryEO.getProjectLibraryId(),null,projectCertificationDirectoryEO.getCut());
+		checkDataLaws(projectCertificationDirectoryEO.getProjectLibraryId(),null,projectCertificationDirectoryEO.getCut());
         Date now = new Date();
         projectCertificationDirectoryEO.setCreateTime(now);
         projectCertificationDirectoryEO.setUpdateTime(now);
@@ -75,7 +75,7 @@ public class ProjectCertificationDirectoryEOServiceImpl extends ServiceImpl<Proj
 	 */
 	@Override
     public void editById(ProjectCertificationDirectoryEO projectCertificationDirectoryEO) {
-		checkData(projectCertificationDirectoryEO.getProjectLibraryId(),projectCertificationDirectoryEO.getId(),projectCertificationDirectoryEO.getCut());
+		checkDataLaws(projectCertificationDirectoryEO.getProjectLibraryId(),projectCertificationDirectoryEO.getId(),projectCertificationDirectoryEO.getCut());
     	Date now = new Date();
         projectCertificationDirectoryEO.setUpdateTime(now);
     	saveOrUpdate(projectCertificationDirectoryEO);
@@ -90,7 +90,7 @@ public class ProjectCertificationDirectoryEOServiceImpl extends ServiceImpl<Proj
 	@Override
     public void deleteById(String id,String cut) {
 		ProjectCertificationDirectoryEO projectCertificationDirectoryEO = queryById(id);
-		checkData(projectCertificationDirectoryEO.getProjectLibraryId(),id,cut);
+		checkDataLaws(projectCertificationDirectoryEO.getProjectLibraryId(),id,cut);
         removeById(id);
     }
 
@@ -257,4 +257,23 @@ public class ProjectCertificationDirectoryEOServiceImpl extends ServiceImpl<Proj
 //		}
 		return true;
 	}
+	/**
+	 * 验证数据权限，只有法规工程师，并且创建人是当前登陆人，才能进行增、删、改操作。
+	 * @return
+	 */
+	public boolean checkDataLaws(String projectLibraryId,String id,String cut){
+		int roleCode = checkUserRole(projectLibraryId);
+		if(roleCode != Integer.parseInt(ProjectRoleEnum.REGULATI_ENGINEER.getValue())
+				&& roleCode != Integer.parseInt(ProjectRoleEnum.STUDIO_ENGINEER.getValue())
+				&& roleCode != Integer.parseInt(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue())){
+			String message = "";
+			if(StringUtils.equals(cut, CutEnum.CN.getValue())){
+				message = "没有权限操作，只有法规工程师才可以操作。";
+			}else if(StringUtils.equals(cut, CutEnum.EN.getValue())){
+				message = "Only regulatory engineer can perform this operation.";
+			}
+			throw new JeroBootException(message);
+		}
+		return true;
+	}
 }

From fcf32c46765d429c579e8b8dc80beb634c56e1b4 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 28 Sep 2023 10:45:35 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5--=E6=B5=81=E7=A8=8B=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E4=BB=BB=E5=8A=A1=E5=BE=85=E5=8F=91=E8=B5=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PlatformProjectLawsInventoryEOServiceImpl.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
index 772cb72a5..409dde28c 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
@@ -4556,8 +4556,8 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 						projectLawsInventoryEOTemp.setProjectLibraryId(projectLawsInventoryEO.getProjectLibraryId());
 						projectLawsInventoryEOTemp.setTaskAffirmStatus(TaskAffirmStatusEnum.NOT_STARTED.getValue());
 						projectLawsInventoryEOTemp.setInventoryAffirmStatus(InventoryAffirmStatusEnum.NOT_STARTED.getValue());
-						projectLawsInventoryEOTemp.setDesignFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
-						projectLawsInventoryEOTemp.setVerifyFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
+						projectLawsInventoryEOTemp.setDesignFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue());
+						projectLawsInventoryEOTemp.setVerifyFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue());
 						datas.add(projectLawsInventoryEOTemp);
 					}
 				}