From 93144eb1a074208b4eccb0088f4da3015c56297e Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Tue, 26 Dec 2023 17:15:13 +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=20=E4=B8=BB=E8=B5=B7=E8=8D=89=E4=BA=BA?=
 =?UTF-8?q?=E7=AC=AC=E4=BA=8C=E6=AC=A1=E6=B1=87=E6=80=BB=E6=B2=A1=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esRevision/service/impl/EsRevisionServiceImpl.java       | 5 ++++-
 1 file changed, 4 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 944132ed..2342d47a 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
@@ -243,7 +243,7 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
                 advicesWrapper.eq(EsRevisionAdvice::getExecutionId, executionId);
                 adviceList = adviceService.list(advicesWrapper);
                 break;
-            case MAIN_DRAFT_USER_COLLECT_FIRST:
+            case MAIN_DRAFT_USER_COLLECT_SECOND:
                 adviceList = adviceService.list(advicesWrapper);
                 break;
         }
@@ -407,8 +407,11 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
                 advices = data.getAdvices();
                 adviceWrapper.eq(EsRevisionAdvice::getExecutionId, executionId);
                 adviceService.remove(adviceWrapper);
+                advices.forEach(advice -> advice.setProcessInstanceId(processInstanceId));
+                advices.forEach(advice -> advice.setExecutionId(executionId));
                 adviceService.saveBatch(advices);
                 processNodeLinkService.incrementSaveNodeUserLink(processDefinitionId, processInstanceId, userMap);
+                break;
             case CONTACT_USER_LEADER_APPROVAL:
                 // 保存流程数据
                 data = revisionData.getData();