From 8e99dd306a3635d5410897de5138231b535fcc68 Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: Wed, 2 Apr 2025 21:03:58 +0800
Subject: [PATCH] =?UTF-8?q?https://gitee.com/dromara/RuoYi-Vue-Plus/issues?=
 =?UTF-8?q?/IBYCY7=20fix=20=E4=BF=AE=E5=A4=8D=E9=80=89=E6=8B=A9=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=E4=BC=9A=E7=AD=BE=E4=BA=BA=E5=91=98=E5=90=8E=EF=BC=8C?=
 =?UTF-8?q?=E4=BC=9A=E7=AD=BE=E5=AE=A1=E6=89=B9=E5=87=BA=E7=8E=B0=E6=AF=8F?=
 =?UTF-8?q?=E4=B8=AA=E4=BB=BB=E5=8A=A1=E7=9A=84=E5=AE=A1=E6=89=B9=E4=BA=BA?=
 =?UTF-8?q?=E9=83=BD=E6=98=AF=E9=80=89=E6=8B=A9=E7=9A=84=E5=A4=9A=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workflow/service/impl/FlwTaskServiceImpl.java      | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java
index d93ba00ab..990c32383 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java
@@ -183,7 +183,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
             // 消息通知
             flwCommonService.sendMessage(definition.getFlowName(), ins.getId(), messageType, notice);
             //设置下一环节处理人
-            setNextHandler(ins.getId());
+            setNextHandler(ins.getId(), completeTaskBo.getAssigneeMap());
             return true;
         } catch (Exception e) {
             log.error(e.getMessage(), e);
@@ -194,9 +194,13 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
     /**
      * 设置下一环节处理人
      *
-     * @param instanceId 实例ID
+     * @param instanceId  实例ID
+     * @param assigneeMap 办理人
      */
-    private void setNextHandler(Long instanceId) {
+    private void setNextHandler(Long instanceId, Map<String, Object> assigneeMap) {
+        if (CollUtil.isEmpty(assigneeMap)) {
+            return;
+        }
         Instance inst = insService.getById(instanceId);
         List<FlowTask> flowTaskList = selectByInstId(instanceId);
         Map<String, Object> variableMap = inst.getVariableMap();