From b471dc55c38815cc14a83345aeb84ae111a51fce Mon Sep 17 00:00:00 2001
From: Lesan <1960681385@qq.com>
Date: Tue, 25 Mar 2025 10:37:38 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AD=98=E5=9C=A8=E5=AD=90=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E6=83=85=E5=86=B5=E4=B8=8B=E7=9A=84=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yudao/module/bpm/enums/task/BpmReasonEnum.java        | 2 +-
 .../bpm/service/task/BpmProcessInstanceServiceImpl.java   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/task/BpmReasonEnum.java b/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/task/BpmReasonEnum.java
index eca18cce6e..46d1482a5e 100644
--- a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/task/BpmReasonEnum.java
+++ b/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/task/BpmReasonEnum.java
@@ -18,7 +18,7 @@ public enum BpmReasonEnum {
     REJECT_TASK("审批不通过任务，原因：{}"), // 场景：用户审批不通过任务。修改文案时，需要注意 isRejectReason 方法
     CANCEL_PROCESS_INSTANCE_BY_START_USER("用户主动取消流程，原因：{}"), // 场景：用户主动取消流程
     CANCEL_PROCESS_INSTANCE_BY_ADMIN("管理员【{}】取消流程，原因：{}"), // 场景：管理员取消流程
-    CANCEL_CHILD_PROCESS_INSTANCE_BY_MAIN_PROCESS("子流程自动取消，原因：子流程已取消"),
+    CANCEL_CHILD_PROCESS_INSTANCE_BY_MAIN_PROCESS("子流程自动取消，原因：主流程已取消"),
 
     // ========== 流程任务的独有原因 ==========
 
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
index efb2cf23b7..709779bf64 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
@@ -853,10 +853,7 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService
                 BpmProcessInstanceStatusEnum.CANCEL.getStatus());
         runtimeService.setVariable(id, BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_REASON, reason);
 
-        // 2. 结束流程
-        taskService.moveTaskToEnd(id, reason);
-
-        // 3. 取消所有子流程
+        // 2. 取消所有子流程
         List<ProcessInstance> subProcessInstances = runtimeService.createProcessInstanceQuery()
                 .superProcessInstanceId(id)
                 .list();
@@ -864,6 +861,9 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService
             updateProcessInstanceCancel(processInstance.getProcessInstanceId(),
                     BpmReasonEnum.CANCEL_CHILD_PROCESS_INSTANCE_BY_MAIN_PROCESS.getReason());
         });
+
+        // 3. 结束流程
+        taskService.moveTaskToEnd(id, reason);
     }
 
     @Override