From b521b4506b4707afe71f3baaf2387e8214fdcce5 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Thu, 14 Dec 2023 11:29:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=90=84=E9=83=A8=E9=97=A8=E4=B8=BB?=
 =?UTF-8?q?=E5=8A=A8=E4=B8=8A=E6=8A=A5=E6=B5=81=E7=A8=8B=20=E8=81=94?=
 =?UTF-8?q?=E7=BB=9C=E4=BA=BA=E6=94=B6=E9=9B=86=E6=96=B0=E5=A2=9E=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E4=B8=A2=E5=A4=B1BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProcessEsAnnualReportServiceImpl.java          | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java
index 7efc4ce2..65fcacb3 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java
@@ -207,7 +207,9 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
                 wrapper.eq(ProcessEsAnnualReport::getProcessInstanceId, processInstanceId);
                 remove(wrapper);
                 contactUserLeaderLeader = (String) runtimeService.getVariable(executionId, contactUser + "-ContactUserLeaderLeader");
+                dataList.forEach(data -> data.setContactUser(contactUser));
                 dataList.forEach(data -> data.setExecutionId(executionId));
+                dataList.forEach(data -> data.setProcessInstanceId(processInstanceId));
                 dataList.forEach(data -> data.setContactUserLeaderLeader(contactUserLeaderLeader));
                 taskService.setVariable(taskId, "contactUserLeaderLeader", contactUserLeaderLeader);
                 saveBatch(dataList);