From bddccb2c5329579b55e82a001ad8fa75b6bcc270 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Fri, 17 Jan 2025 16:57:08 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=B6=88=E8=B4=B9=E6=95=B0=E6=8D=AE=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=A0=A1=E9=AA=8C=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1336273346723840]表单标签消费数据配置校验优化 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1336273346723840 --- .../framework/service/UserServiceImpl.java | 5 ++++- .../form/attribute/handler/TableInputerHandler.java | 13 +++++++++++-- .../attribute/handler/TableSelectorHandler.java | 13 +++++++++++-- 3 files changed, 26 insertions(+), 5 deletions(-) diff --git a/src/main/java/neatlogic/framework/service/UserServiceImpl.java b/src/main/java/neatlogic/framework/service/UserServiceImpl.java index d8d184e4e..78aa20278 100644 --- a/src/main/java/neatlogic/framework/service/UserServiceImpl.java +++ b/src/main/java/neatlogic/framework/service/UserServiceImpl.java @@ -102,7 +102,10 @@ public class UserServiceImpl implements UserService { resultSet.addAll(userUuidSet); } } - return userMapper.getUserUuidListByUuidListAndIsActive(new ArrayList<>(resultSet), 1); + if (CollectionUtils.isNotEmpty(resultSet)) { + return userMapper.getUserUuidListByUuidListAndIsActive(new ArrayList<>(resultSet), 1); + } + return new ArrayList<>(); } /** diff --git a/src/main/java/neatlogic/module/framework/form/attribute/handler/TableInputerHandler.java b/src/main/java/neatlogic/module/framework/form/attribute/handler/TableInputerHandler.java index d99659620..79e1b5b15 100644 --- a/src/main/java/neatlogic/module/framework/form/attribute/handler/TableInputerHandler.java +++ b/src/main/java/neatlogic/module/framework/form/attribute/handler/TableInputerHandler.java @@ -822,12 +822,21 @@ public class TableInputerHandler extends FormHandlerBase { if (dataObj.isEmpty()) { throw new FormExtendAttributeConfigIllegalException(this.getHandler(), key, field, "{}"); } + String uuid = dataObj.getString("uuid"); String key1 = dataObj.getString("key"); if (key1 == null) { - throw new FormExtendAttributeConfigIllegalException(this.getHandler(), key, field + ".key"); + if (StringUtils.isBlank(uuid)) { + throw new FormExtendAttributeConfigIllegalException(this.getHandler(), key, field + ".key"); + } else { + key1 = uuid; + } } if (StringUtils.isBlank(key1)) { - throw new FormExtendAttributeConfigIllegalException(this.getHandler(), key, field + ".key", key1); + if (StringUtils.isBlank(uuid)) { + throw new FormExtendAttributeConfigIllegalException(this.getHandler(), key, field + ".key", key1); + } else { + key1 = uuid; + } } String label = dataObj.getString("label"); if (label == null) { diff --git a/src/main/java/neatlogic/module/framework/form/attribute/handler/TableSelectorHandler.java b/src/main/java/neatlogic/module/framework/form/attribute/handler/TableSelectorHandler.java index ae1592782..a8d174cde 100644 --- a/src/main/java/neatlogic/module/framework/form/attribute/handler/TableSelectorHandler.java +++ b/src/main/java/neatlogic/module/framework/form/attribute/handler/TableSelectorHandler.java @@ -687,12 +687,21 @@ public class TableSelectorHandler extends FormHandlerBase { if (dataObj.isEmpty()) { throw new FormExtendAttributeConfigIllegalException(this.getHandler(), key, field, "{}"); } + String uuid = dataObj.getString("uuid"); String key1 = dataObj.getString("key"); if (key1 == null) { - throw new FormExtendAttributeConfigIllegalException(this.getHandler(), key, field + ".key"); + if (StringUtils.isBlank(uuid)) { + throw new FormExtendAttributeConfigIllegalException(this.getHandler(), key, field + ".key"); + } else { + key1 = uuid; + } } if (StringUtils.isBlank(key1)) { - throw new FormExtendAttributeConfigIllegalException(this.getHandler(), key, field + ".key", key1); + if (StringUtils.isBlank(uuid)) { + throw new FormExtendAttributeConfigIllegalException(this.getHandler(), key, field + ".key", key1); + } else { + key1 = uuid; + } } String label = dataObj.getString("label"); if (label == null) { -- Gitee From 8eb6fa961186330794b7646750c80794d9f40406 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Fri, 17 Jan 2025 17:02:56 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=B6=88=E8=B4=B9=E6=95=B0=E6=8D=AE=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=A0=A1=E9=AA=8C=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1336273346723840]表单标签消费数据配置校验优化 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1336273346723840 --- src/main/java/neatlogic/framework/form/dto/FormAttributeVo.java | 2 +- .../framework/form/attribute/handler/TableInputerHandler.java | 2 ++ .../framework/form/attribute/handler/TableSelectorHandler.java | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/neatlogic/framework/form/dto/FormAttributeVo.java b/src/main/java/neatlogic/framework/form/dto/FormAttributeVo.java index e469e2f31..9a5bda09e 100644 --- a/src/main/java/neatlogic/framework/form/dto/FormAttributeVo.java +++ b/src/main/java/neatlogic/framework/form/dto/FormAttributeVo.java @@ -357,7 +357,7 @@ public class FormAttributeVo implements Serializable { } public String getConfigStr() { - if (configStr == null && config != null) { + if (config != null) { configStr = config.toJSONString(); } return configStr; diff --git a/src/main/java/neatlogic/module/framework/form/attribute/handler/TableInputerHandler.java b/src/main/java/neatlogic/module/framework/form/attribute/handler/TableInputerHandler.java index 79e1b5b15..b48e69cb6 100644 --- a/src/main/java/neatlogic/module/framework/form/attribute/handler/TableInputerHandler.java +++ b/src/main/java/neatlogic/module/framework/form/attribute/handler/TableInputerHandler.java @@ -829,6 +829,7 @@ public class TableInputerHandler extends FormHandlerBase { throw new FormExtendAttributeConfigIllegalException(this.getHandler(), key, field + ".key"); } else { key1 = uuid; + dataObj.put("key", key1); } } if (StringUtils.isBlank(key1)) { @@ -836,6 +837,7 @@ public class TableInputerHandler extends FormHandlerBase { throw new FormExtendAttributeConfigIllegalException(this.getHandler(), key, field + ".key", key1); } else { key1 = uuid; + dataObj.put("key", key1); } } String label = dataObj.getString("label"); diff --git a/src/main/java/neatlogic/module/framework/form/attribute/handler/TableSelectorHandler.java b/src/main/java/neatlogic/module/framework/form/attribute/handler/TableSelectorHandler.java index a8d174cde..f99e54ac0 100644 --- a/src/main/java/neatlogic/module/framework/form/attribute/handler/TableSelectorHandler.java +++ b/src/main/java/neatlogic/module/framework/form/attribute/handler/TableSelectorHandler.java @@ -694,6 +694,7 @@ public class TableSelectorHandler extends FormHandlerBase { throw new FormExtendAttributeConfigIllegalException(this.getHandler(), key, field + ".key"); } else { key1 = uuid; + dataObj.put("key", key1); } } if (StringUtils.isBlank(key1)) { @@ -701,6 +702,7 @@ public class TableSelectorHandler extends FormHandlerBase { throw new FormExtendAttributeConfigIllegalException(this.getHandler(), key, field + ".key", key1); } else { key1 = uuid; + dataObj.put("key", key1); } } String label = dataObj.getString("label"); -- Gitee