From 494fab37d9d94ad994f32e0934ea4dc746f7a2b5 Mon Sep 17 00:00:00 2001
From: wangli <274027703@qq.com>
Date: Mon, 14 Apr 2025 17:34:04 +0800
Subject: [PATCH] =?UTF-8?q?hotfix=20-=20=E4=BF=AE=E5=A4=8D=E6=92=A4?=
 =?UTF-8?q?=E5=9B=9E=E6=8E=A5=E5=8F=A3=E7=9A=84=E5=8F=82=E6=95=B0=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/engine/cmd/CustomCancelProcessInstanceAsyncCmd.java  | 3 +--
 .../core/engine/cmd/CustomCancelProcessInstanceCmd.java       | 2 +-
 .../controller/web/bpmn/BpmnProcessInstanceController.java    | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomCancelProcessInstanceAsyncCmd.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomCancelProcessInstanceAsyncCmd.java
index 59f6c00b2..4052f92f6 100644
--- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomCancelProcessInstanceAsyncCmd.java
+++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomCancelProcessInstanceAsyncCmd.java
@@ -38,14 +38,13 @@ public class CustomCancelProcessInstanceAsyncCmd extends AbstractCommand<Void> i
 
     @Override
     public Void execute(CommandContext commandContext) {
-        String processInstanceId = dto.getProcessInstanceId(), tenantId = dto.getTenantId();
+        String processInstanceId = dto.getProcessInstanceId();
         BpmnTaskDelegateAssigner initiator = dto.getInitiator();
         ProcessEngineConfigurationImpl processEngineConfiguration = CommandContextUtil.getProcessEngineConfiguration(commandContext);
 
         HistoryService historyService = processEngineConfiguration.getHistoryService();
         HistoricProcessInstance instance = historyService.createHistoricProcessInstanceQuery()
                 .processInstanceId(processInstanceId)
-                .processInstanceTenantId(tenantId)
                 .singleResult();
         if (Objects.isNull(instance)) {
             throw new WorkflowEngineException(PROCESS_INSTANCE_NOT_EXISTS);
diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomCancelProcessInstanceCmd.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomCancelProcessInstanceCmd.java
index fa27a55c0..061110cb0 100644
--- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomCancelProcessInstanceCmd.java
+++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomCancelProcessInstanceCmd.java
@@ -102,7 +102,7 @@ public class CustomCancelProcessInstanceCmd extends AbstractCommand<Void> implem
             throw new WorkflowEngineException(PROCESS_INSTANCE_CANCEL_FAIL_NOT_EXISTS);
         }
 
-        if (Objects.isNull(initiator) || !initiator.comparePersonIdToOther(instance.getStartUserId())) {
+        if (!Objects.equals(Boolean.TRUE, superAdmin) || !initiator.comparePersonIdToOther(instance.getStartUserId())) {
             throw new WorkflowEngineException(PROCESS_INSTANCE_CANCEL_FAIL_NOT_SELF);
         }
 
diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnProcessInstanceController.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnProcessInstanceController.java
index 85d34774d..b2c2bd342 100644
--- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnProcessInstanceController.java
+++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnProcessInstanceController.java
@@ -147,7 +147,7 @@ public class BpmnProcessInstanceController extends BasicPopulateAvatarController
     @DeleteMapping("/cancel")
     @Override
     @RepeatSubmit
-    public CommonResponse<Boolean> cancelProcessInstance(@Validated(ValidGroup.Insert.class) @RequestBody BpmnProcessInstanceCancelDTO dto) {
+    public CommonResponse<Boolean> cancelProcessInstance(@Validated(ValidGroup.Update.class) @RequestBody BpmnProcessInstanceCancelDTO dto) {
         log.info("撤回审核cancelProcessInstant===>>>参数：{}", JSONUtil.toJsonStr(dto));
         populateUsersAvatar(dto.getInitiator());
         SuperBpmnProcessInstanceCancelDTO target = new SuperBpmnProcessInstanceCancelDTO();
@@ -159,7 +159,7 @@ public class BpmnProcessInstanceController extends BasicPopulateAvatarController
     @DeleteMapping("/super/cancel")
     @RepeatSubmit
     @Override
-    public CommonResponse<Boolean> superCancelProcessInstance(@Validated(ValidGroup.Update.class) @RequestBody SuperBpmnProcessInstanceCancelDTO dto) {
+    public CommonResponse<Boolean> superCancelProcessInstance(@Validated(ValidGroup.Insert.class) @RequestBody SuperBpmnProcessInstanceCancelDTO dto) {
         log.info("超级撤回审核 superCancelProcessInstant===>>>参数：{}", JSONUtil.toJsonStr(dto));
         populateUsersAvatar(dto.getInitiator());
         return success(bpmnProcessInstanceService.cancelProcessInstance(dto));