From 174ded3b86cf0f8826b23acefeb192cfb6b5be3d Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Fri, 26 Apr 2024 18:31:58 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E7=BB=84=E5=90=88?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E7=BB=84=E5=90=88=E5=B7=A5=E5=85=B7?=
 =?UTF-8?q?=E6=9C=89=E4=BD=9C=E4=B8=9A=E5=8F=82=E6=95=B0=EF=BC=8C=E4=B8=94?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=BF=85=E5=A1=AB=EF=BC=8C=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E7=BB=84=E5=90=88=E5=B7=A5=E5=85=B7=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1143530179756032]组合工具-组合工具有作业参数，且参数必填，保存组合工具异常 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1143530179756032
---
 .../module/autoexec/service/AutoexecServiceImpl.java   | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/main/java/neatlogic/module/autoexec/service/AutoexecServiceImpl.java b/src/main/java/neatlogic/module/autoexec/service/AutoexecServiceImpl.java
index 07303d2e..f2ca5e56 100644
--- a/src/main/java/neatlogic/module/autoexec/service/AutoexecServiceImpl.java
+++ b/src/main/java/neatlogic/module/autoexec/service/AutoexecServiceImpl.java
@@ -640,7 +640,15 @@ public class AutoexecServiceImpl implements AutoexecService, IAutoexecServiceCro
             return true;
         }
         for (int i = 0; i < validateList.size(); i++) {
-            JSONObject validateObj = validateList.getJSONObject(i);
+//            JSONObject validateObj = validateList.getJSONObject(i);
+            Object validate = validateList.get(i);
+            if (validate == null) {
+                continue;
+            }
+            if (!(validate instanceof JSONObject)) {
+                continue;
+            }
+            JSONObject validateObj = (JSONObject) validate;
             if (MapUtils.isEmpty(validateObj)) {
                 continue;
             }
-- 
Gitee


From de057a833808b17ce0e5de52d9f3507d5c66faf1 Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Fri, 26 Apr 2024 18:32:32 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E7=BB=84=E5=90=88?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E7=BB=84=E5=90=88=E5=B7=A5=E5=85=B7?=
 =?UTF-8?q?=E6=9C=89=E4=BD=9C=E4=B8=9A=E5=8F=82=E6=95=B0=EF=BC=8C=E4=B8=94?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=BF=85=E5=A1=AB=EF=BC=8C=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E7=BB=84=E5=90=88=E5=B7=A5=E5=85=B7=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1143530179756032]组合工具-组合工具有作业参数，且参数必填，保存组合工具异常 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1143530179756032
---
 .../neatlogic/module/autoexec/service/AutoexecServiceImpl.java   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/neatlogic/module/autoexec/service/AutoexecServiceImpl.java b/src/main/java/neatlogic/module/autoexec/service/AutoexecServiceImpl.java
index f2ca5e56..d6ea0156 100644
--- a/src/main/java/neatlogic/module/autoexec/service/AutoexecServiceImpl.java
+++ b/src/main/java/neatlogic/module/autoexec/service/AutoexecServiceImpl.java
@@ -640,7 +640,6 @@ public class AutoexecServiceImpl implements AutoexecService, IAutoexecServiceCro
             return true;
         }
         for (int i = 0; i < validateList.size(); i++) {
-//            JSONObject validateObj = validateList.getJSONObject(i);
             Object validate = validateList.get(i);
             if (validate == null) {
                 continue;
-- 
Gitee