diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/job/AsyncActivityCallbackJobHandler.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/job/AsyncActivityCallbackJobHandler.java index bdf55e3f2..7ccdc3841 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/job/AsyncActivityCallbackJobHandler.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/job/AsyncActivityCallbackJobHandler.java @@ -21,7 +21,6 @@ import org.flowable.variable.api.delegate.VariableScope; import java.util.Objects; import static cn.axzo.workflow.core.common.code.BpmnInstanceRespCode.PROCESS_INSTANCE_ID_NOT_EXISTS; -import static cn.axzo.workflow.core.engine.cmd.CustomBizSpecifyAssigneeToTaskCmd.getOperateTask; /** * 业务节点的触发离开的任务处理器 @@ -45,7 +44,7 @@ public class AsyncActivityCallbackJobHandler extends AbstractJobHandler implemen ProcessEngineConfigurationImpl processEngineConfiguration = CommandContextUtil.getProcessEngineConfiguration(commandContext); FlowableEventDispatcher eventDispatcher = processEngineConfiguration.getEventDispatcher(); TaskService taskService = processEngineConfiguration.getTaskService(); - Task task = getOperateTask(taskService, dto.getTriggerId()); + Task task = taskService.createTaskQuery().executionId(dto.getTriggerId()).singleResult(); HistoryService historyService = processEngineConfiguration.getHistoryService(); HistoricProcessInstance processInstance = historyService.createHistoricProcessInstanceQuery().includeProcessVariables() diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnProcessActivityController.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnProcessActivityController.java index 222497af3..38f08a9eb 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnProcessActivityController.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnProcessActivityController.java @@ -120,7 +120,7 @@ public class BpmnProcessActivityController implements ProcessActivityApi { */ @PostMapping("/timeout/trigger") @Override - public CommonResponse setTimeoutTrigger(BpmnActivityTimeoutTriggerDTO dto) { + public CommonResponse setTimeoutTrigger(@Validated @RequestBody BpmnActivityTimeoutTriggerDTO dto) { return CommonResponse.success(bpmnProcessActivityService.setTimeoutTrigger(dto)); } @@ -132,7 +132,7 @@ public class BpmnProcessActivityController implements ProcessActivityApi { */ @PostMapping("/timeout/callback") @Override - public CommonResponse setTimeoutCallback(BpmnActivityTimeoutCallbackDTO dto) { + public CommonResponse setTimeoutCallback(@Validated @RequestBody BpmnActivityTimeoutCallbackDTO dto) { return CommonResponse.success(bpmnProcessActivityService.setTimeOutCallback(dto)); } }