From 95c65248017d5cd7f037a16529d88ef2842012f2 Mon Sep 17 00:00:00 2001
From: wangzhijiang <1358525938@qq.com>
Date: Wed, 14 Jun 2023 16:11:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E7=AB=AF-=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=E6=B5=81=E7=A8=8B=E5=AF=B9=E6=8E=A5=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProjectCertificationInventoryEOServiceImpl.java     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
index 4d6990549..03843587c 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
@@ -1219,7 +1219,6 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 			detail.setTaskDefinitionKey(taskDefinitionKey);
 			detail.setStatus(TaskStatusEnum.NOT_DONE.getValue());
 			detail.setCreateTime(new Date());
-			detail.setStatus(TaskStatusEnum.NOT_DONE.getValue());
 		});
 
 		List<String> userIdList = processInfoDetailEOList.stream().map(ProcessInfoDetailEO::getUserId).distinct().collect(Collectors.toList());
@@ -1227,6 +1226,10 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		removeWrap.lambda().eq(ProcessInfoDetailEO::getProcessInfoId,processInfoId);
 		removeWrap.lambda().in(ProcessInfoDetailEO::getUserId,userIdList);
 		removeWrap.lambda().eq(ProcessInfoDetailEO::getTaskDefinitionKey,taskDefinitionKey);
+		if(!StringUtils.equals(taskDefinitionKey,CertificationFlowNodeEnum.RZGCSSC.getKey())){
+			List<String> dataIdList = processInfoDetailEOList.stream().map(ProcessInfoDetailEO::getProjectLawsInventoryId).distinct().collect(Collectors.toList());
+			removeWrap.lambda().in(ProcessInfoDetailEO::getProjectLawsInventoryId,dataIdList);
+		}
 		// 删除用户在这个认证清单流程中其它的待办任务
 		this.processInfoDetailEOService.remove(removeWrap);