From 57e209aa32d22f527afe60fe7a5efdf11380346e Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Mon, 19 Feb 2024 10:33:27 +0800
Subject: [PATCH] =?UTF-8?q?fix:=2081083=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--=E5=BC=BA=E5=88=B6?=
 =?UTF-8?q?=E6=92=A4=E5=9B=9E=E5=90=8E=EF=BC=8C=E8=8D=89=E7=A8=BF=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E5=AF=B9=E5=BA=94=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/EsRevisionServiceImpl.java          | 12 ++----------
 1 file changed, 2 insertions(+), 10 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 f43fcdee..0a79fd00 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
@@ -153,7 +153,7 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
         // 获取第一个任务的taskId
         String taskId = actFlowCommonService.getFirstTaskId(processInstanceId, userId, processDefinitionId);
         // 手动翻译
-        String jsonData = translationAspect.manualParseDictText(this.getHandleData(taskId), actVariables);
+        String jsonData = translationAspect.manualParseDictText(this.getHandleData(taskId), revisionData.getFlowUser());
         // 强制撤回
         commonVO.setProcessInstanceId(processInstanceId);
         actFlowCommonService.saveFirstNodeDraft(commonVO, ProcessTypeEnum.ES_REVISION, jsonData);
@@ -323,16 +323,8 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
         // 某些节点需要对数据进行特殊处理
         switch (xmlNodeId) {
             case OTHER_DRAFT_USER_UPLOAD:
-                String curUserId = "";
-                try {
-                    curUserId = UserUtils.getUserId();
-                } catch (Exception e) {
-                    log.error("获取当前用户失败");
-                }
                 boolean findFlag = false;
-                otherDraftUserVOS.forEach(o -> {
-                    o.setOperateType(null);
-                });
+                otherDraftUserVOS.forEach(o -> o.setOperateType(null));
                 for (OtherDraftUserVO o : otherDraftUserVOS) {
                     if (findFlag) {
                         o.setOperateType(OperateTypeEnum.CANNOT_OPERATE.getValue());