From fe04c9c480507a49b41b9d0a1dd75a938db9c4b5 Mon Sep 17 00:00:00 2001
From: wangli <274027703@qq.com>
Date: Fri, 24 May 2024 17:02:18 +0800
Subject: [PATCH] =?UTF-8?q?update(REQ-2324)=20-=20=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?=E6=9E=84=E9=80=A0=E5=99=A8=E9=87=8D=E8=BD=BD=EF=BC=8C=E5=87=8F?=
 =?UTF-8?q?=E5=B0=91=E4=B8=80=E4=BA=9B=E7=8E=B0=E6=9C=89=E8=B0=83=E7=94=A8?=
 =?UTF-8?q?=E7=9A=84=E4=BB=A3=E7=A0=81=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workflow/core/engine/cmd/CustomApproveTaskCmd.java    | 8 ++++++++
 .../listener/task/AutoOperatorEvent_101_Listener.java     | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomApproveTaskCmd.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomApproveTaskCmd.java
index 4527c2972..b67065ad8 100644
--- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomApproveTaskCmd.java
+++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomApproveTaskCmd.java
@@ -71,6 +71,11 @@ public class CustomApproveTaskCmd implements Command<Void>, Serializable {
         this.nodeTypes = dto.getNodeTypes();
     }
 
+    public CustomApproveTaskCmd(String taskId, String advice, String operationDesc, List<AttachmentDTO> attachmentList,
+                                BpmnTaskDelegateAssigner approver, BpmnTaskDelegateAssigner nextApprover) {
+        this(taskId, advice, operationDesc, attachmentList, approver, nextApprover, null);
+    }
+
     public CustomApproveTaskCmd(String taskId, String advice, String operationDesc, List<AttachmentDTO> attachmentList,
                                 BpmnTaskDelegateAssigner approver, BpmnTaskDelegateAssigner nextApprover,
                                 List<BpmnFlowNodeType> nodeTypes) {
@@ -96,6 +101,9 @@ public class CustomApproveTaskCmd implements Command<Void>, Serializable {
         Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
         validTask(historicTaskInstance, (TaskEntity) task, approver, nodeTypes);
 
+        // TODO 所有的跟 Task 相关的动作都可以在这里进行扩展，用于扩展八大按钮标准动作以外的一些逻辑，但这里需要结合 Spring 能力，需设计好扩展点，否则无法进行扩展
+        // 其他动态也应该在类似的地方预留扩展点
+
         if (StringUtils.hasLength(advice)) {
             Authentication.setAuthenticatedUserId(approver.buildAssigneeId());
             addComment(commandContext, task, COMMENT_TYPE_ADVICE, advice);
diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/AutoOperatorEvent_101_Listener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/AutoOperatorEvent_101_Listener.java
index ae0a363aa..3cd6dcb90 100644
--- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/AutoOperatorEvent_101_Listener.java
+++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/AutoOperatorEvent_101_Listener.java
@@ -305,7 +305,7 @@ public class AutoOperatorEvent_101_Listener extends AbstractBpmnEventListener<Ta
         BpmnTaskDelegateAssigner assigner = BpmnTaskDelegateAssigner.toObjectCompatible(
                 delegateTask.getVariable(INTERNAL_TASK_RELATION_ASSIGNEE_INFO + delegateTask.getId()));
         commandExecutor.execute(new CustomApproveTaskCmd(delegateTask.getId(), null, "自动通过",
-                Collections.emptyList(), assigner, null, null));
+                Collections.emptyList(), assigner, null));
     }
 
 }