From 87cb971c29c142417b2ea69ef9734ee25b1fec99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Thu, 10 Aug 2023 18:17:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=EF=BC=8Cstudio=E5=8F=91=E5=B8=83=E4=B8=8D=E6=B6=89?=
 =?UTF-8?q?=E5=8F=8A=E4=B8=8D=E7=BB=99=E6=B3=95=E8=A7=84=E5=BE=85=E5=8A=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectLawsInventoryEOServiceImpl.java    | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

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 352e1fac6..238c781b6 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
@@ -9293,17 +9293,19 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				projectLawsInventoryEO.setInventoryAffirmDueDate(endTime);
 
 				userIdList.add(projectLawsInventoryEO.getRegulationOwnerId());
-
-				ProcessInfoDetailEO processInfoDetailEO = new ProcessInfoDetailEO();
-				processInfoDetailEO.setProjectLawsInventoryId(projectLawsInventoryEO.getId());
-				processInfoDetailEO.setUserId(projectLawsInventoryEO.getRegulationOwnerId());
-				processInfoDetailEO.setTaskDefinitionKey(InventoryAffirmNodeEnum.REGULATION_OWNER_AUDIT.getKey());
-				processInfoDetailEO.setEndTime(endTime);
-				processInfoDetailEO.setCreateTime(new Date());
-				processInfoDetailEO.setCreateBy(currentUser.getId());
-				processInfoDetailEO.setStatus(TaskStatusEnum.NOT_DONE.getValue());
-
-				processInfoDetailEOList.add(processInfoDetailEO);
+				//如果都是不涉及就不发待办
+				if (!projectLawsInventoryEO.getDesignFlowStatus().equals(ComplianceFlowStatusEnum.UNINVOLVED.getValue())
+						&& !projectLawsInventoryEO.getVerifyFlowStatus().equals(ComplianceFlowStatusEnum.UNINVOLVED.getValue())) {
+					ProcessInfoDetailEO processInfoDetailEO = new ProcessInfoDetailEO();
+					processInfoDetailEO.setProjectLawsInventoryId(projectLawsInventoryEO.getId());
+					processInfoDetailEO.setUserId(projectLawsInventoryEO.getRegulationOwnerId());
+					processInfoDetailEO.setTaskDefinitionKey(InventoryAffirmNodeEnum.REGULATION_OWNER_AUDIT.getKey());
+					processInfoDetailEO.setEndTime(endTime);
+					processInfoDetailEO.setCreateTime(new Date());
+					processInfoDetailEO.setCreateBy(currentUser.getId());
+					processInfoDetailEO.setStatus(TaskStatusEnum.NOT_DONE.getValue());
+					processInfoDetailEOList.add(processInfoDetailEO);
+				}
 			}
 		}