From cb435e308b1469fc6d253d3f3d35a51081d1d6f4 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Tue, 26 Dec 2023 16:48:24 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=B6=E4=BF=AE=E8=AE=A2=E5=AD=90?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esRevision/service/impl/EsRevisionServiceImpl.java | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

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 527f9af1..f4d18996 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
@@ -218,6 +218,7 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
         advicesWrapper.eq(EsRevisionAdvice::getProcessInstanceId, processInstanceId);
         wrapper.eq(ProcessEsRevision::getProcessInstanceId, processInstanceId);
         ProcessEsRevision data = getOne(wrapper);
+        List<EsRevisionAdvice> adviceList = new ArrayList<>();
         List<OtherDraftUserVO> otherDraftUserVOS = data.parseOtherDraftUserVOS();
         List<InspectContentVO> inspectContentVOS = data.parseInspectContents();
         String xmlNodeId = record.getNodeId();
@@ -240,9 +241,12 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
             case CONTACT_USER_COLLECT:
             case CONTACT_USER_LEADER_APPROVAL:
                 advicesWrapper.eq(EsRevisionAdvice::getExecutionId, executionId);
+                adviceList = adviceService.list(advicesWrapper);
+                break;
+            case MAIN_DRAFT_USER_COLLECT_FIRST:
+                adviceList = adviceService.list(advicesWrapper);
                 break;
         }
-        List<EsRevisionAdvice> adviceList = adviceService.list(advicesWrapper);
         data.setAdvices(adviceList);
         data.setOtherDraftUserVOS(otherDraftUserVOS);
         data.setInspectContents(inspectContentVOS);
@@ -414,8 +418,8 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
                         .eq(EsRevisionAdvice::getProcessInstanceId, processInstanceId)
                         .eq(EsRevisionAdvice::getExecutionId, executionId));
                 advices = data.getAdvices();
-                advices.forEach(advice -> advice.setProcessInstanceId(processInstanceId));
-                advices.forEach(advice -> advice.setExecutionId(executionId));
+                adviceWrapper.eq(EsRevisionAdvice::getExecutionId, executionId);
+                adviceService.remove(adviceWrapper);
                 adviceService.saveBatch(advices);
                 break;
             case MAIN_DRAFT_USER_COLLECT_SECOND: