From e11529375ef1e52c548597d12271c7ddb9fb9437 Mon Sep 17 00:00:00 2001
From: smallNorthLee <18210040298@163.com>
Date: Mon, 24 Feb 2025 22:56:18 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=A1=E6=89=B9=E6=97=B6=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=B8=8B=E4=B8=80=E4=B8=AA=E8=8A=82=E7=82=B9=E7=9A=84?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=98=AF=E5=90=A6=E4=B8=BA=E8=87=AA=E9=80=89?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9=E4=BA=BA=E6=98=AF=E5=90=A6=E5=B7=B2=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E4=BA=86=E5=AE=A1=E6=89=B9=E4=BA=BA=EF=BC=8C=E5=90=A6?=
 =?UTF-8?q?=E5=88=99=E7=94=B1=E5=89=8D=E7=AB=AF=E4=BC=A0=E9=80=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/admin/task/vo/task/BpmTaskApproveReqVO.java    | 4 ++--
 .../dept/BpmTaskCandidateStartUserSelectStrategy.java         | 4 ++--
 .../yudao/module/bpm/service/task/BpmTaskServiceImpl.java     | 4 ++++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskApproveReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskApproveReqVO.java
index 07078b8db3..b84cb44ca6 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskApproveReqVO.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskApproveReqVO.java
@@ -24,7 +24,7 @@ public class BpmTaskApproveReqVO {
     @Schema(description = "变量实例（动态表单）", requiredMode = Schema.RequiredMode.REQUIRED)
     private Map<String, Object> variables;
 
-    @Schema(description = "节点审批人", example = "[1,2]")
-    private List<Long> assignees;
+    @Schema(description = "发起人自选审批人 Map", example = "{taskKey1: [1, 2]}")
+    private Map<String, List<Long>> startUserSelectAssignees;
 
 }
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateStartUserSelectStrategy.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateStartUserSelectStrategy.java
index d547643609..07b051cadd 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateStartUserSelectStrategy.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateStartUserSelectStrategy.java
@@ -56,7 +56,7 @@ public class BpmTaskCandidateStartUserSelectStrategy extends AbstractBpmTaskCand
         // 获得审批人，如果不存在，则直接返回空，避免类型转换异常
         List<Long> assignees = startUserSelectAssignees.get(execution.getCurrentActivityId());
         if (CollUtil.isEmpty(assignees)){
-            return null;
+            return Sets.newLinkedHashSet();
         }
         return new LinkedHashSet<>(assignees);
     }
@@ -74,7 +74,7 @@ public class BpmTaskCandidateStartUserSelectStrategy extends AbstractBpmTaskCand
         // 获得审批人，如果不存在，则直接返回空，避免类型转换异常
         List<Long> assignees = startUserSelectAssignees.get(activityId);
         if (CollUtil.isEmpty(assignees)){
-            return null;
+            return Sets.newLinkedHashSet();
         }
         return new LinkedHashSet<>(assignees);
     }
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java
index 76c7771035..f4d08b59d9 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java
@@ -520,6 +520,10 @@ public class BpmTaskServiceImpl implements BpmTaskService {
         if (CollUtil.isNotEmpty(reqVO.getVariables())) {
             Map<String, Object> variables = FlowableUtils.filterTaskFormVariable(reqVO.getVariables());
             // 修改表单的值需要存储到 ProcessInstance 变量
+            if (CollUtil.isNotEmpty(reqVO.getStartUserSelectAssignees())) {
+                variables.put(BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_START_USER_SELECT_ASSIGNEES,
+                        reqVO.getStartUserSelectAssignees());
+            }
             runtimeService.setVariables(task.getProcessInstanceId(), variables);
             taskService.complete(task.getId(), variables, true);
         } else {