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 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 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 cancelProcessInstance(@Validated(ValidGroup.Insert.class) @RequestBody BpmnProcessInstanceCancelDTO dto) { + public CommonResponse 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 superCancelProcessInstance(@Validated(ValidGroup.Update.class) @RequestBody SuperBpmnProcessInstanceCancelDTO dto) { + public CommonResponse superCancelProcessInstance(@Validated(ValidGroup.Insert.class) @RequestBody SuperBpmnProcessInstanceCancelDTO dto) { log.info("超级撤回审核 superCancelProcessInstant===>>>参数:{}", JSONUtil.toJsonStr(dto)); populateUsersAvatar(dto.getInitiator()); return success(bpmnProcessInstanceService.cancelProcessInstance(dto));