From 95a9b9c6c4d92ab034fa9e06b8057a180c62f8b2 Mon Sep 17 00:00:00 2001
From: wangli <274027703@qq.com>
Date: Mon, 29 Jan 2024 17:37:54 +0800
Subject: [PATCH] =?UTF-8?q?update=20-=20=E4=BC=98=E5=8C=96=E8=BF=9E?=
 =?UTF-8?q?=E7=BB=AD=E5=A4=9A=E8=8A=82=E7=82=B9=E8=87=AA=E5=8A=A8=E9=80=9A?=
 =?UTF-8?q?=E8=BF=87=E4=B8=8D=E7=94=9F=E6=95=88=E7=9A=84=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../task/AutoOperatorEventListener.java       | 40 +++++++++----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/AutoOperatorEventListener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/AutoOperatorEventListener.java
index 2ec97493c..35d30cc39 100644
--- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/AutoOperatorEventListener.java
+++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/AutoOperatorEventListener.java
@@ -72,30 +72,30 @@ public class AutoOperatorEventListener implements BpmnTaskEventListener, Ordered
                             autoReject(delegateTask);
                             break;
                         default:
+                            // 如果审批人为空时, 读取 approverEmptyHandleType = 自动通过或自动驳回时
+                            if (!StringUtils.hasLength(delegateTask.getAssignee())) {
+                                BpmnMetaParserHelper.getApproverEmptyHandleType(userTask)
+                                        .ifPresent(approverEmptyHandleTypeEnum -> {
+                                            switch (approverEmptyHandleTypeEnum) {
+                                                case autoPassed:
+                                                    autoPass(delegateTask);
+                                                    break;
+                                                case autoRejection:
+                                                    autoReject(delegateTask);
+                                                    break;
+                                                case autoSkipped:
+                                                    // autoReject(delegateTask);
+                                                    // 非产品需求, 暂时不实现, 这里的功能似乎可以用 taskService.deleteTask 来实现
+                                                    break;
+                                                default:
+                                                    break;
+                                            }
+                                        });
+                            }
                             break;
                     }
                 });
 
-        // 如果审批人为空时, 读取 approverEmptyHandleType = 自动通过或自动驳回时
-        if (!StringUtils.hasLength(delegateTask.getAssignee())) {
-            BpmnMetaParserHelper.getApproverEmptyHandleType(userTask)
-                    .ifPresent(approverEmptyHandleTypeEnum -> {
-                        switch (approverEmptyHandleTypeEnum) {
-                            case autoPassed:
-                                autoPass(delegateTask);
-                                break;
-                            case autoRejection:
-                                autoReject(delegateTask);
-                                break;
-                            case autoSkipped:
-                                // autoReject(delegateTask);
-                                // 非产品需求, 暂时不实现, 这里的功能似乎可以用 taskService.deleteTask 来实现
-                                break;
-                            default:
-                                break;
-                        }
-                    });
-        }
         if (log.isDebugEnabled()) {
             log.debug("AutoOperatorEventListener#onCreated...end: {}", delegateTask.getTaskDefinitionKey());
         }