diff --git a/src/main/java/neatlogic/framework/form/dto/FormAttributeVo.java b/src/main/java/neatlogic/framework/form/dto/FormAttributeVo.java index e469e2f31ab20efa2bde181aa4c156f6badf01d3..9a5bda09ea3f67db16f5e8f2634d0b41a4c9b730 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/framework/service/UserServiceImpl.java b/src/main/java/neatlogic/framework/service/UserServiceImpl.java index d8d184e4e81b6d3235d534bcb06b79a2f5572fe9..78aa2027818f636be28f219b4e04eebcc9795e5b 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 d99659620fd48148f4f2250e216188d530242742..b48e69cb66c0599a3e8a58784dbeeb0e8a6cbefc 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,23 @@ 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; + dataObj.put("key", key1); + } } 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; + dataObj.put("key", key1); + } } 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 ae159278207389a5dac99aa7c4e5dac7bf2cb21a..f99e54ac023530b5428d73d6adf7805b3699e936 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,23 @@ 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; + dataObj.put("key", key1); + } } 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; + dataObj.put("key", key1); + } } String label = dataObj.getString("label"); if (label == null) {