From 9a3eee1ebd0bd24e8e5e72192bcd24f18e2adc24 Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Fri, 26 Apr 2024 17:27:56 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF-?=
 =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8=E5=8D=95=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E8=A7=84=E8=8C=83=E5=AE=9A=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1141293256769536]后端-自定义表单标准规范定义 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1141293256769536
---
 .../java/neatlogic/framework/form/dto/FormAttributeVo.java | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/main/java/neatlogic/framework/form/dto/FormAttributeVo.java b/src/main/java/neatlogic/framework/form/dto/FormAttributeVo.java
index a6be7a28a..93819612b 100644
--- a/src/main/java/neatlogic/framework/form/dto/FormAttributeVo.java
+++ b/src/main/java/neatlogic/framework/form/dto/FormAttributeVo.java
@@ -25,6 +25,7 @@ import neatlogic.framework.form.attribute.core.IFormAttributeHandler;
 import neatlogic.framework.form.constvalue.FormConditionModel;
 import neatlogic.framework.restful.annotation.EntityField;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import java.io.Serializable;
 import java.util.*;
@@ -166,6 +167,9 @@ public class FormAttributeVo implements Serializable {
         if (config == null && configStr != null) {
             config = JSONObject.parseObject(configStr);
         }
+        if (config == null) {
+            config = new JSONObject();
+        }
         return config;
     }
 
@@ -353,6 +357,9 @@ public class FormAttributeVo implements Serializable {
         if (configStr == null && config != null) {
             configStr = config.toJSONString();
         }
+        if (StringUtils.isBlank(configStr)) {
+            configStr = "{}";
+        }
         return configStr;
     }
 
-- 
Gitee


From 5c19e1072ecc5e1888277c6d5ca5961762883e2f Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Fri, 26 Apr 2024 17:30:35 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF-?=
 =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8=E5=8D=95=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E8=A7=84=E8=8C=83=E5=AE=9A=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1141293256769536]后端-自定义表单标准规范定义 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1141293256769536
---
 .../neatlogic/framework/form/dto/FormAttributeVo.java    | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/main/java/neatlogic/framework/form/dto/FormAttributeVo.java b/src/main/java/neatlogic/framework/form/dto/FormAttributeVo.java
index 93819612b..1f8ef9372 100644
--- a/src/main/java/neatlogic/framework/form/dto/FormAttributeVo.java
+++ b/src/main/java/neatlogic/framework/form/dto/FormAttributeVo.java
@@ -25,10 +25,12 @@ import neatlogic.framework.form.attribute.core.IFormAttributeHandler;
 import neatlogic.framework.form.constvalue.FormConditionModel;
 import neatlogic.framework.restful.annotation.EntityField;
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
 
 import java.io.Serializable;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 public class FormAttributeVo implements Serializable {
     private static final long serialVersionUID = 8282018124626035430L;
@@ -357,9 +359,6 @@ public class FormAttributeVo implements Serializable {
         if (configStr == null && config != null) {
             configStr = config.toJSONString();
         }
-        if (StringUtils.isBlank(configStr)) {
-            configStr = "{}";
-        }
         return configStr;
     }
 
-- 
Gitee