From 280e8f0de254c152490900b35008d7dbfd210f17 Mon Sep 17 00:00:00 2001
From: wangli <274027703@qq.com>
Date: Tue, 3 Sep 2024 18:35:20 +0800
Subject: [PATCH] =?UTF-8?q?feat(REQ-2616)=20-=20=E5=AE=8C=E5=96=84Activity?=
 =?UTF-8?q?=20=E8=8A=82=E7=82=B9=E7=9A=84=E5=9B=9E=E8=B0=83,=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E5=AE=9A=E6=97=B6=E8=A7=A6=E5=8F=91=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/engine/job/AsyncActivityCallbackJobHandler.java      | 3 +--
 .../controller/web/bpmn/BpmnProcessActivityController.java    | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

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<Boolean> setTimeoutTrigger(BpmnActivityTimeoutTriggerDTO dto) {
+    public CommonResponse<Boolean> 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<Boolean> setTimeoutCallback(BpmnActivityTimeoutCallbackDTO dto) {
+    public CommonResponse<Boolean> setTimeoutCallback(@Validated @RequestBody BpmnActivityTimeoutCallbackDTO dto) {
         return CommonResponse.success(bpmnProcessActivityService.setTimeOutCallback(dto));
     }
 }