From ee5cb23730ebdf7cb0827ea5a22ea29cffe1785d Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 12 May 2025 20:48:33 +0800
Subject: [PATCH] =?UTF-8?q?fix(bpm):=E4=BF=AE=E5=A4=8D=E8=87=AA=E9=80=89?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9=E4=BA=BA=E6=97=B6=E5=AD=98=E5=9C=A8=E5=A4=9A?=
 =?UTF-8?q?=E4=B8=AA=E5=B9=B6=E8=A1=8C=E8=8A=82=E7=82=B9=E6=97=B6=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E4=BA=BA=E8=A6=86=E7=9B=96=E9=97=AE=E9=A2=98=20?=
 =?UTF-8?q?=E5=A4=9A=E4=B8=AA=E5=B9=B6=E8=A1=8C=E8=8A=82=E7=82=B9=E4=B8=AD?=
 =?UTF-8?q?=E5=8F=AA=E6=9C=89=E6=9C=80=E5=90=8E=E4=B8=80=E4=B8=AA=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E7=9A=84=E5=AE=A1=E6=89=B9=E4=BA=BA=E4=BC=9A=E8=A2=AB?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=EF=BC=8C=E5=85=B6=E4=BB=96=E9=83=BD=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/bpm/service/task/BpmTaskServiceImpl.java      | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

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 95d2a9ff7e..1164f4da72 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
@@ -597,6 +597,7 @@ public class BpmTaskServiceImpl implements BpmTaskService {
      * @param nextAssignees 下一个节点审批人集合（参数）
      * @param processInstance 流程实例
      */
+    @SuppressWarnings("unchecked")
     private Map<String, Object> validateAndSetNextAssignees(String taskDefinitionKey, Map<String, Object> variables, BpmnModel bpmnModel,
                                                             Map<String, List<Long>> nextAssignees, ProcessInstance processInstance) {
         // simple 设计器第一个节点默认为发起人节点，不校验是否存在审批人
@@ -646,10 +647,10 @@ public class BpmTaskServiceImpl implements BpmTaskService {
                     approveUserSelectAssignees = new HashMap<>();
                 }
                 approveUserSelectAssignees.put(nextFlowNode.getId(), assignees);
-                @SuppressWarnings("unchecked")
-                Map<String,List<Long>> existing = (Map<String,List<Long>>) variables.get(BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_APPROVE_USER_SELECT_ASSIGNEES);
-                if(CollUtil.isNotEmpty(existing)) {
-                    approveUserSelectAssignees.putAll(existing);
+                Map<String,List<Long>> existingApproveUserSelectAssignees = (Map<String,List<Long>>) variables.get(
+                        BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_APPROVE_USER_SELECT_ASSIGNEES);
+                if (CollUtil.isNotEmpty(existingApproveUserSelectAssignees)) {
+                    approveUserSelectAssignees.putAll(existingApproveUserSelectAssignees);
                 }
                 variables.put(BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_APPROVE_USER_SELECT_ASSIGNEES, approveUserSelectAssignees);
             }