From 200450fbabd01b077157f8f063d90ba82bb823a4 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Mon, 25 Dec 2023 13:34:54 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?=
 =?UTF-8?q?=E8=AE=A2=E6=B5=81=E7=A8=8B-=E5=BE=81=E6=B1=82=E6=84=8F?=
 =?UTF-8?q?=E8=A7=81=E8=AE=BE=E7=BD=AE=E6=88=AA=E6=AD=A2=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esRevision/service/impl/EsRevisionServiceImpl.java      | 6 +++---
 1 file changed, 3 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 2a351531..150cfad6 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
@@ -269,6 +269,7 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
         LambdaUpdateWrapper<ProcessEsRevision> updateWrapper = new LambdaUpdateWrapper<>();
         wrapper.eq(ProcessEsRevision::getProcessInstanceId, processInstanceId);
         wrapper.eq(ProcessEsRevision::getDelFlag, YesOrNoEnum.NO.getValue());
+        ProcessEsRevision dataDb = getOne(wrapper);
         updateWrapper.eq(ProcessEsRevision::getProcessInstanceId, processInstanceId);
         updateWrapper.eq(ProcessEsRevision::getDelFlag, YesOrNoEnum.NO.getValue());
         // 获取当前流程
@@ -307,7 +308,6 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
                 break;
             case OTHER_DRAFT_USER_UPLOAD:
                 data = revisionData.getData();
-                ProcessEsRevision dataDb = getOne(wrapper);
                 List<OtherDraftUserVO> otherDraftUserVOListDB = dataDb.parseOtherDraftUserVOS();
                 Map<String, OtherDraftUserVO> map = otherDraftUserVOListDB.stream()
                         .collect(Collectors.toMap(OtherDraftUserVO::getUser, o -> o));
@@ -342,7 +342,6 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
                 break;
             case RATER_RATE:
                 // 保存打分记录
-                dataDb = getOne(wrapper);
                 data = revisionData.getData();
                 List<ReviewMeetingDetailVO> reviewMeetingDetails = data.getReviewMeetingDetails();
                 ProcessEsRevision revisionDb = getById(dataDb.getId());
@@ -372,7 +371,8 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
                 flowUser = revisionData.getFlowUser();
                 String adviceUsers = (String) flowUser.get("adviceUserList");
                 List<String> adviceUserList = Arrays.asList(adviceUsers.split(","));
-                taskService.setVariable(taskId, "adviceUserList", adviceUserList);
+                taskService.setVariableLocal(taskId, "adviceUserList", adviceUserList);
+                taskService.setVariableLocal(taskId, "adviceDeadline", data.getAdviceDeadline());
                 userMap.put("adviceUserList", adviceUserList);
                 // 设置截止时间
                 saveOrUpdate(data);