From ed0d0725b9b44fdc45516ecb02b89151442a62f9 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 26 Sep 2023 14:36:50 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6-=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...formProjectLawsInventoryEOServiceImpl.java | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 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 f09d765ef..8d13eb542 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
@@ -682,13 +682,13 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 	public void deleteById(String id, String projectLibraryId, String cut) {
 		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		int isProjectRole = this.checkUserRole(projectLibraryId, currentUser.getId(), "");
-		if (!ProjectRoleEnum.STUDIO_ENGINEER.getValue().equals(String.valueOf(isProjectRole))) {
-			if (CutEnum.CN.getValue().equals(cut)) {
-				throw new JeroBootException("该用户没有删除权限");
-			} else {
-				throw new JeroBootException("The user has no deletion permission");
-			}
-		}
+//		if (!ProjectRoleEnum.STUDIO_ENGINEER.getValue().equals(String.valueOf(isProjectRole))) {
+//			if (CutEnum.CN.getValue().equals(cut)) {
+//				throw new JeroBootException("该用户没有删除权限");
+//			} else {
+//				throw new JeroBootException("The user has no deletion permission");
+//			}
+//		}
 
 		//更新log
 		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
@@ -734,13 +734,13 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 		}
 		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		int isProjectRole = this.checkUserRole(projectLibraryId, currentUser.getId(), "");
-		if (!ProjectRoleEnum.STUDIO_ENGINEER.getValue().equals(String.valueOf(isProjectRole))) {
-			if (CutEnum.CN.getValue().equals(cut)) {
-				throw new JeroBootException("该用户没有删除权限");
-			} else {
-				throw new JeroBootException("The user has no deletion permission");
-			}
-		}
+//		if (!ProjectRoleEnum.STUDIO_ENGINEER.getValue().equals(String.valueOf(isProjectRole))) {
+//			if (CutEnum.CN.getValue().equals(cut)) {
+//				throw new JeroBootException("该用户没有删除权限");
+//			} else {
+//				throw new JeroBootException("The user has no deletion permission");
+//			}
+//		}
 
 		//更新log
 		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();

From 02fde85171c2469d8950bec40b11eae7d54985cd Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 26 Sep 2023 14:51:15 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6-=E6=B3=95?=
 =?UTF-8?q?=E8=A7=84=E6=B8=85=E5=8D=95=E8=B0=83=E5=8F=96=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=8A=B6=E6=80=81=E4=B8=BA=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=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   | 8 ++++----
 1 file changed, 4 insertions(+), 4 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 8d13eb542..2100df96e 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
@@ -399,8 +399,8 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 						projectLawsInventoryEOTemp.setTaskAffirmStatus(TaskAffirmStatusEnum.NOT_STARTED.getValue());
 						projectLawsInventoryEOTemp.setInventoryAffirmStatus(InventoryAffirmStatusEnum.NOT_STARTED.getValue());
 						projectLawsInventoryEOTemp.setStandId(dummyInventoryInfoEO.getBussDocumentLibraryId());
-						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());
 						projectLawsInventoryEOTemp.setCreateTime(new Date());
 						projectLawsInventoryEOTemp.setUpdateTime(new Date());
 						projectLawsInventoryEOS.add(projectLawsInventoryEOTemp);
@@ -425,8 +425,8 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 							projectLawsInventoryEOTemp.setTaskAffirmStatus(TaskAffirmStatusEnum.NOT_STARTED.getValue());
 							projectLawsInventoryEOTemp.setInventoryAffirmStatus(InventoryAffirmStatusEnum.NOT_STARTED.getValue());
 							projectLawsInventoryEOTemp.setStandId(dummyInventoryInfoEO.getBussDocumentLibraryId());
-							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());
 							projectLawsInventoryEOTemp.setCreateTime(new Date());
 							projectLawsInventoryEOTemp.setUpdateTime(new Date());
 							projectLawsInventoryEOS.add(projectLawsInventoryEOTemp);