From 9e725ab7b089de7cf9d6de1a3dd3be8b61bbb7bb Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Tue, 16 Jan 2024 17:16:08 +0800
Subject: [PATCH] =?UTF-8?q?fix:=2080901=20=E4=BC=81=E6=A0=87=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E7=AB=8B=E9=A1=B9/=E5=8F=98=E6=9B=B4=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B--=E5=AE=A1=E6=89=B9=E8=8A=82=E7=82=B9=E9=A9=B3?=
 =?UTF-8?q?=E5=9B=9E=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProcessEsInitChangeServiceImpl.java         | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java
index 5c8f7486..cac3b0a6 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java
@@ -275,6 +275,9 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
             if (taskName.equals(STANDARDIZATION_CHECK)) {
                 taskService.setVariable(taskId, "standardizationApprovalUser", userId);
             }
+        } else {
+            // 设置流程变量
+            runtimeService.setVariableLocal(processInstanceId, "pass", false);
         }
         // 更新审批表为完成，填充数据
         actFlowCommonService.updateApprovalInfo(commonVO, taskId, pass);
@@ -283,8 +286,6 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
         // 删除草稿
         actFlowCommonService.removeDraft(commonVO);
         if (!pass) {
-            // 设置流程变量
-            runtimeService.setVariableLocal(processInstanceId, "pass", false);
             // 如果是会签节点，驳回后要将其余节点recode设置为 未处理 状态
             if (taskName.equals(CounterSignNodeNameConstants.ES_INIT_CHANGE_EXPERT_NODE_NAME)) {
                 actFlowCommonService.updateOtherCountersignRecodeStatus(processInstanceId, CounterSignNodeNameConstants.ES_INIT_CHANGE_EXPERT_NODE_NAME);