wangli/workflow-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/REQ-3769

Browse Source
This commit is contained in:
wangli 2025-04-15 19:28:55 +08:00
commit 6cf881daaa
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomCancelProcessInstanceAsyncCmd.java
View File

@ -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);

2
workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomCancelProcessInstanceCmd.java
View File

@ -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);
}

4
workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnProcessInstanceController.java
View File

@ -175,7 +175,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();
@ -187,7 +187,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));