From 074eaece8761e460c74b874d4c8d03380fa0d5b5 Mon Sep 17 00:00:00 2001
From: yangwei <867012372@qq.com>
Date: Sat, 29 Mar 2025 20:51:14 +0800
Subject: [PATCH] =?UTF-8?q?[feat]=201=E3=80=81=E5=AF=B9=E6=8E=A5=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E9=A2=84=E8=AD=A6=EF=BC=8C=E5=B9=B6=E4=B8=94=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E6=8E=A5=E5=8F=A3=E5=93=8D=E5=BA=94=E9=80=9F=E5=BA=A6?=
 =?UTF-8?q?=E3=80=82=202=E3=80=81=E5=AF=B9=E6=8E=A5=E9=A2=84=E8=AD=A6?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=B8=AD=E9=A2=84=E8=AD=A6=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/dromara/workflow/domain/FlowLabel.java   |  2 +-
 .../workflow/handler/ListTypeHandler.java        | 16 ++++++++--------
 .../resources/mapper/workflow/FlwLabelMapper.xml |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/dk-modules/workflow/src/main/java/org/dromara/workflow/domain/FlowLabel.java b/dk-modules/workflow/src/main/java/org/dromara/workflow/domain/FlowLabel.java
index 6d7531a..3476833 100644
--- a/dk-modules/workflow/src/main/java/org/dromara/workflow/domain/FlowLabel.java
+++ b/dk-modules/workflow/src/main/java/org/dromara/workflow/domain/FlowLabel.java
@@ -37,7 +37,7 @@ public class FlowLabel {
     /**
      * 部门id集合
      */
-    @NotNull(message = "部门id不能为空", groups = AddGroup.class)
+    @NotNull(message = "标签id不能为空", groups = AddGroup.class)
     @TableField(value = "label_ids",typeHandler = ListTypeHandler.class)
     List<String> labelIds;
 }
diff --git a/dk-modules/workflow/src/main/java/org/dromara/workflow/handler/ListTypeHandler.java b/dk-modules/workflow/src/main/java/org/dromara/workflow/handler/ListTypeHandler.java
index f63591d..d367369 100644
--- a/dk-modules/workflow/src/main/java/org/dromara/workflow/handler/ListTypeHandler.java
+++ b/dk-modules/workflow/src/main/java/org/dromara/workflow/handler/ListTypeHandler.java
@@ -16,36 +16,36 @@ import java.util.List;
 
 @MappedJdbcTypes(JdbcType.VARCHAR)
 @MappedTypes({List.class})
-public class ListTypeHandler implements TypeHandler<List<Long>> {
+public class ListTypeHandler implements TypeHandler<List<String>> {
 
     @Override
-    public void setParameter(PreparedStatement ps, int i, List<Long> list, JdbcType jdbcType) throws SQLException {
+    public void setParameter(PreparedStatement ps, int i, List<String> list, JdbcType jdbcType) throws SQLException {
         ps.setString(i, JsonUtil.toJson(list));
     }
 
     @Override
-    public List<Long> getResult(ResultSet rs, String columnName) throws SQLException {
+    public List<String> getResult(ResultSet rs, String columnName) throws SQLException {
         if (StringUtils.isBlank(rs.getString(columnName))) {
             return new ArrayList<>();
         }
-        return JsonUtil.jsonToList(rs.getString(columnName), Long.class);
+        return JsonUtil.jsonToList(rs.getString(columnName), String.class);
     }
 
     @Override
-    public List<Long> getResult(ResultSet rs, int columnIndex) throws SQLException {
+    public List<String> getResult(ResultSet rs, int columnIndex) throws SQLException {
         if (StringUtils.isBlank(rs.getString(columnIndex))) {
             return new ArrayList<>();
         }
-        return JsonUtil.jsonToList(rs.getString(columnIndex), Long.class);
+        return JsonUtil.jsonToList(rs.getString(columnIndex), String.class);
     }
 
     @Override
-    public List<Long> getResult(CallableStatement cs, int columnIndex) throws SQLException {
+    public List<String> getResult(CallableStatement cs, int columnIndex) throws SQLException {
         String value = cs.getString(columnIndex);
 
         if (StringUtils.isBlank(value)) {
             return new ArrayList<>();
         }
-        return JsonUtil.jsonToList(value, Long.class);
+        return JsonUtil.jsonToList(value, String.class);
     }
 }
diff --git a/dk-modules/workflow/src/main/resources/mapper/workflow/FlwLabelMapper.xml b/dk-modules/workflow/src/main/resources/mapper/workflow/FlwLabelMapper.xml
index 86615f1..ad82fca 100644
--- a/dk-modules/workflow/src/main/resources/mapper/workflow/FlwLabelMapper.xml
+++ b/dk-modules/workflow/src/main/resources/mapper/workflow/FlwLabelMapper.xml
@@ -5,13 +5,13 @@
 <mapper namespace="org.dromara.workflow.mapper.FlwLabelMapper">
 
     <select id="getFlowLabel" resultType="org.dromara.workflow.domain.FlowLabel">
-        select fd.* from flow_depart fd where JSON_CONTAINS(fd.label_ids, #{labelId})
+        select fd.* from flow_label fd where JSON_CONTAINS(fd.label_ids, #{labelId})
     </select>
 
     <select id="checkFlowLabel" resultType="java.lang.Integer">
         SELECT
             count(1)
-        FROM flow_depart fd
+        FROM flow_label fd
         where
         <foreach collection="labelIds" item="item" open="(" separator=" OR " close=")">
             JSON_CONTAINS(fd.label_ids, CONCAT('"', #{item}, '"'))