From 737282a71e6f2c1876060318a020c82bc6635e9d Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Tue, 26 Dec 2023 16:25:06 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=B6=E4=BF=AE=E8=AE=A2=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E5=AD=90=E6=B5=81=E7=A8=8B=E8=81=94=E7=BB=9C=E4=BA=BA?=
 =?UTF-8?q?=E6=94=B6=E9=9B=86=E8=8A=82=E7=82=B9=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esRevision/service/impl/EsRevisionServiceImpl.java    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
index 1b22a18b..09285c38 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
@@ -268,8 +268,10 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
         String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId);
         LambdaQueryWrapper<ProcessEsRevision> wrapper = new LambdaQueryWrapper<>();
         LambdaUpdateWrapper<ProcessEsRevision> updateWrapper = new LambdaUpdateWrapper<>();
+        LambdaUpdateWrapper<EsRevisionAdvice> adviceWrapper = new LambdaUpdateWrapper<>();
         wrapper.eq(ProcessEsRevision::getProcessInstanceId, processInstanceId);
         wrapper.eq(ProcessEsRevision::getDelFlag, YesOrNoEnum.NO.getValue());
+        adviceWrapper.eq(EsRevisionAdvice::getProcessInstanceId, processInstanceId);
         ProcessEsRevision dataDb = getOne(wrapper);
         updateWrapper.eq(ProcessEsRevision::getProcessInstanceId, processInstanceId);
         updateWrapper.eq(ProcessEsRevision::getDelFlag, YesOrNoEnum.NO.getValue());
@@ -395,10 +397,14 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
                 break;
             case CONTACT_USER_COLLECT:
                 data = revisionData.getData();
+                // 先删后增
                 runtimeService.setVariable(executionId, "contactUserLeader", data.getContactUserLeader());
                 userMap.put("contactUserLeader", data.getContactUserLeader());
                 advices = data.getAdvices();
-                adviceService.saveOrUpdateBatch(advices);
+                //
+                adviceWrapper.eq(EsRevisionAdvice::getExecutionId, executionId);
+                adviceService.remove(adviceWrapper);
+                adviceService.saveBatch(advices);
                 processNodeLinkService.incrementSaveNodeUserLink(processDefinitionId, processInstanceId, userMap);
             case CONTACT_USER_LEADER_APPROVAL:
                 // 保存流程数据