From f29808dfaf883c45c641bd766288a147c1abc275 Mon Sep 17 00:00:00 2001
From: yangwei <867012372@qq.com>
Date: Tue, 6 May 2025 16:24:12 +0800
Subject: [PATCH] =?UTF-8?q?[feat]=201=E3=80=81=E5=A2=9E=E5=8A=A0=E9=A2=84?=
 =?UTF-8?q?=E8=AD=A6=E7=AE=A1=E7=90=86=E6=A0=B9=E6=8D=AE=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=202=E3=80=81=E5=A2=9E=E5=8A=A0=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E6=B5=81=E5=8A=A8=E6=80=81=E5=A2=9E=E5=8A=A0=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E4=BA=BA=E9=80=BB=E8=BE=91=E3=80=82=203=E3=80=81?=
 =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E8=AE=BE=E5=A4=87=E6=9D=83=E9=99=90=E2=91=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/FlwTaskServiceImpl.java       | 18 +++++++++++-------
 .../mapper/workflow/FlwTaskMapper.xml          |  2 +-
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java b/dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java
index f7b1d35..71ec239 100644
--- a/dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java
+++ b/dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java
@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -41,6 +42,7 @@ import org.dromara.warm.flow.orm.mapper.FlowTaskMapper;
 import org.dromara.workflow.api.domain.RemoteStartProcessReturn;
 import org.dromara.workflow.common.ConditionalOnEnable;
 import org.dromara.workflow.common.enums.MessageTypeEnum;
+import org.dromara.workflow.common.enums.TaskAssigneeEnum;
 import org.dromara.workflow.common.enums.TaskAssigneeType;
 import org.dromara.workflow.common.enums.TaskStatusEnum;
 import org.dromara.workflow.domain.bo.*;
@@ -908,13 +910,15 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
 
             List<RemoteUserVo> totalUser = new ArrayList<>();
 
-            if (!first.contains("${handler}")){
-                String[] split = first.split("@@");
-                for (String handleFlag : split) {
-                    List<RemoteUserVo> remoteUserVos = flwTaskAssigneeService.fetchUsersByStorageId(handleFlag);
-                    totalUser.addAll(remoteUserVos);
-                }
-            }
+           if (ObjectUtil.isNotEmpty(first)){
+               String[] split = first.split("@@");
+               for (String handleFlag : split) {
+                   if (!handleFlag.equals("${handler}")){
+                       List<RemoteUserVo> remoteUserVos = flwTaskAssigneeService.fetchUsersByStorageId(handleFlag);
+                       totalUser.addAll(remoteUserVos);
+                   }
+               }
+           }
 
             //比较差值
             List<RemoteUserVo> different = totalUser.stream()
diff --git a/dk-modules/workflow/src/main/resources/mapper/workflow/FlwTaskMapper.xml b/dk-modules/workflow/src/main/resources/mapper/workflow/FlwTaskMapper.xml
index 141e784..6110a55 100644
--- a/dk-modules/workflow/src/main/resources/mapper/workflow/FlwTaskMapper.xml
+++ b/dk-modules/workflow/src/main/resources/mapper/workflow/FlwTaskMapper.xml
@@ -115,6 +115,6 @@
 
 
     <select id="getPermissionFlag" resultType="java.lang.String">
-        select fn.permission_flag from flow_node fn where fn.definition_id = #{definitionId}  and fn.node_type = #{nodeType}  and fn.node_code = #{nodeCode} and fn.del_flag = 0
+        select fn.permission_flag from flow_node fn where fn.definition_id = #{definitionId}  and fn.node_type = #{nodeType}  and fn.node_code = #{nodeCode} and fn.del_flag = '0'
     </select>
 </mapper>