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 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> { +public class ListTypeHandler implements TypeHandler> { @Override - public void setParameter(PreparedStatement ps, int i, List list, JdbcType jdbcType) throws SQLException { + public void setParameter(PreparedStatement ps, int i, List list, JdbcType jdbcType) throws SQLException { ps.setString(i, JsonUtil.toJson(list)); } @Override - public List getResult(ResultSet rs, String columnName) throws SQLException { + public List 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 getResult(ResultSet rs, int columnIndex) throws SQLException { + public List 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 getResult(CallableStatement cs, int columnIndex) throws SQLException { + public List 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 @@