From ade8374fd579d395e21ec8c9d699483048f67e32 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Tue, 30 Jan 2024 16:31:33 +0800
Subject: [PATCH] =?UTF-8?q?fix:=2080491=20=E4=BC=81=E6=A0=87=E5=88=B6?=
 =?UTF-8?q?=E4=BF=AE=E8=AE=A2=E6=B5=81=E7=A8=8B=EF=BC=88=E4=B8=BB=E8=B5=B7?=
 =?UTF-8?q?=E8=8D=89=E4=BA=BA=E4=B8=8A=E4=BC=A0=E4=BC=9A=E8=AE=AE=E7=BA=AA?=
 =?UTF-8?q?=E8=A6=81=EF=BC=89--=E6=A0=A1=E5=AF=B9=E4=BA=BA(=E5=85=B6?=
 =?UTF-8?q?=E4=BB=96=E8=B5=B7=E8=8D=89=E4=BA=BA)=20=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E5=B8=A6=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/EsRevisionServiceImpl.java       | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 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 edb65f71..ef91f817 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
@@ -129,8 +129,15 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
         String processInstanceId = processInstance.getId();
         // 保存数据
         data.setProcessInstanceId(processInstanceId);
-        data.getOtherDraftUserVOS().forEach(o -> o.setFinishFlag(YesOrNoEnum.NO.getValue()));
-        data.setOtherDrafterUploadFileJson(data.getOtherDraftUserVOS());
+        List<OtherDraftUserVO> otherDraftUserVOS = data.getOtherDraftUserVOS();
+        if (otherDraftUserVOS != null && !otherDraftUserVOS.isEmpty()) {
+            data.getOtherDraftUserVOS().forEach(o -> o.setFinishFlag(YesOrNoEnum.NO.getValue()));
+            data.setOtherDrafterUploadFileJson(otherDraftUserVOS);
+            data.setProofreader(otherDraftUserVOS.stream()
+                    .map(OtherDraftUserVO::getUser)
+                    .distinct()
+                    .collect(Collectors.joining(",")));
+        }
         save(data);
         // 手动设置所有流程变量
         actFlowCommonService.setProcessVariables(processInstanceId, actVariables);
@@ -417,6 +424,10 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
                     taskService.setVariable(taskId, "otherDraftUserList", otherDraftUserVOS.stream().map(OtherDraftUserVO::getUser)
                             .collect(Collectors.toList()));
                     otherDraftUserVOS.forEach(o -> o.setFinishFlag(YesOrNoEnum.NO.getValue()));
+                    data.setProofreader(otherDraftUserVOS.stream()
+                            .map(OtherDraftUserVO::getUser)
+                            .distinct()
+                            .collect(Collectors.joining(",")));
                     data.setOtherDraftUserVOS(otherDraftUserVOS);
                     data.setOtherDrafterUploadFileJson(otherDraftUserVOS);
                 }