From d84b055d46ed73292907aa1bbd8b14e69b5a2b9e Mon Sep 17 00:00:00 2001
From: wangli <274027703@qq.com>
Date: Mon, 25 Aug 2025 17:00:37 +0800
Subject: [PATCH] =?UTF-8?q?feat(REQ-4418)=20-=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=8E=A8=E6=B5=8B=E6=9C=AA=E6=9D=A5=E8=8A=82=E7=82=B9=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E6=97=B6=E7=9A=84=E6=8A=84=E9=80=81=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../engine/cmd/CustomForecastUserTaskAssigneeCmd.java     | 8 ++++++--
 .../core/service/impl/BpmnProcessInstanceServiceImpl.java | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomForecastUserTaskAssigneeCmd.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomForecastUserTaskAssigneeCmd.java
index c127eaadb..ef63102bc 100644
--- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomForecastUserTaskAssigneeCmd.java
+++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomForecastUserTaskAssigneeCmd.java
@@ -38,18 +38,22 @@ public class CustomForecastUserTaskAssigneeCmd extends AbstractCommand<List<Bpmn
     private final String processInstanceId;
     private final UserTask userTask;
     private final EngineExecutionStartListener engineExecutionStartListener;
+    private final Integer categoryVersion;
 
     public CustomForecastUserTaskAssigneeCmd(String processInstanceId, UserTask userTask,
-                                             EngineExecutionStartListener engineExecutionStartListener) {
+                                             EngineExecutionStartListener engineExecutionStartListener,
+                                             Integer categoryVersion) {
         this.processInstanceId = processInstanceId;
         this.userTask = userTask;
         this.engineExecutionStartListener = engineExecutionStartListener;
+        this.categoryVersion = categoryVersion;
     }
 
     @Override
     public String paramToJsonString() {
         Map<String, Object> params = new HashMap<>();
         params.put("processInstanceId", processInstanceId);
+        params.put("categoryVersion", categoryVersion);
         return JSON.toJSONString(params);
     }
 
@@ -67,7 +71,7 @@ public class CustomForecastUserTaskAssigneeCmd extends AbstractCommand<List<Bpmn
                 (DelegateExecution) list.get(0), false)));
 
         // 如果没找到审批人,加载管理员
-        if (CollectionUtils.isEmpty(forecastAssigners)) {
+        if (CollectionUtils.isEmpty(forecastAssigners) && categoryVersion < 2) {
             log.info("流程实例: {} 推测审批人时, UserTask{}: 未找到审批人, 开始根据'审批人为空'时的兜底配置进行计算!", processInstanceId,
                     userTask.getId());
             BpmnMetaParserHelper.getApproverEmptyHandleType(userTask).ifPresent(type -> {
diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessInstanceServiceImpl.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessInstanceServiceImpl.java
index 2766ec1a3..39dd6c341 100644
--- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessInstanceServiceImpl.java
+++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessInstanceServiceImpl.java
@@ -1125,7 +1125,7 @@ public class BpmnProcessInstanceServiceImpl implements BpmnProcessInstanceServic
             List<BpmnTaskDelegateAssigner> forecastAssigners =
                     springProcessEngineConfiguration.getCommandExecutor()
                             .execute(new CustomForecastUserTaskAssigneeCmd(processInstanceId,
-                                    i, engineExecutionStartListener));
+                                    i, engineExecutionStartListener, categoryVersion));
             node.setForecastAssigners(forecastAssigners);
             if (CollectionUtils.isEmpty(forecastAssigners) && categoryVersion < 2) {
                 getApproverEmptyHandleType(i).ifPresent(emptyHandleType -> {