From 043211350d27706848e31d0801acd5f69313dad3 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Wed, 27 Dec 2023 17:36:38 +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-=E8=81=94=E7=BB=9C=E4=BA=BA=E4=B8=BB=E7=AE=A1?=
 =?UTF-8?q?=E7=BA=A7=E9=A2=86=E5=AF=BC=E6=96=B0=E5=A2=9E=E6=84=8F=E8=A7=81?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=84=8F=E8=A7=81=E6=8F=90=E5=87=BA=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/EsRevisionServiceImpl.java          | 12 +++++++++++-
 1 file changed, 11 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 1cd91afa..29a8eaf8 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
@@ -247,6 +247,8 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
                 }
                 break;
             case CONTACT_USER_COLLECT:
+                String contactUserLeader = (String) runtimeService.getVariable(executionId, executionId + "-ContactUserLeader");
+                data.setContactUserLeader(contactUserLeader);
             case CONTACT_USER_LEADER_APPROVAL:
                 advicesWrapper.eq(EsRevisionAdvice::getExecutionId, executionId);
                 adviceList = adviceService.list(advicesWrapper);
@@ -271,6 +273,7 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
             throw new JeroBootException("taskId为空或任务不存在");
         }
         String userId = actFlowCommonService.getOriginTaskAssignee(taskId);
+        String curUserId = UserUtils.getUserId();
         Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
         // 获取执行id
         String executionId = task.getExecutionId();
@@ -405,7 +408,9 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
             case CONTACT_USER_COLLECT:
                 data = revisionData.getData();
                 // 先删后增
-                runtimeService.setVariable(executionId, "contactUserLeader", data.getContactUserLeader());
+                String contactUserLeader = data.getContactUserLeader();
+                runtimeService.setVariable(executionId, "contactUserLeader", contactUserLeader);
+                runtimeService.setVariable(executionId, executionId + "-ContactUserLeader", contactUserLeader);
                 userMap.put("contactUserLeader", data.getContactUserLeader());
                 advices = data.getAdvices();
                 adviceWrapper.eq(EsRevisionAdvice::getExecutionId, executionId);
@@ -429,6 +434,11 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
                     adviceService.remove(adviceWrapper);
                     advices.forEach(advice -> advice.setProcessInstanceId(processInstanceId));
                     advices.forEach(advice -> advice.setExecutionId(executionId));
+                    advices.forEach(advice -> {
+                        if (StrUtil.isBlank(advice.getCreateUserId())) {
+                            advice.setCreateUserId(curUserId);
+                        }
+                    });
                     adviceService.saveBatch(advices);
                 }
                 break;