From 3ffb43affd8be1b4dc1165dd993a425a59074851 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Mon, 16 Jun 2025 16:46:58 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E7=94=A8JavascriptU?= =?UTF-8?q?til=E7=B1=BB=E6=9B=BF=E6=8D=A2RunScriptUtil=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1444983029071872]用JavascriptUtil类替换RunScriptUtil类 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1444983029071872 --- src/main/java/neatlogic/framework/util/NotifyPolicyUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/neatlogic/framework/util/NotifyPolicyUtil.java b/src/main/java/neatlogic/framework/util/NotifyPolicyUtil.java index 6fff72b71..73a1ea7a2 100644 --- a/src/main/java/neatlogic/framework/util/NotifyPolicyUtil.java +++ b/src/main/java/neatlogic/framework/util/NotifyPolicyUtil.java @@ -29,6 +29,7 @@ import neatlogic.framework.notify.core.*; import neatlogic.framework.notify.dao.mapper.NotifyMapper; import neatlogic.framework.notify.dto.*; import neatlogic.framework.transaction.core.AfterTransactionJob; +import neatlogic.framework.util.javascript.JavascriptUtil; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; @@ -148,7 +149,7 @@ public class NotifyPolicyUtil { String script = conditionConfig.buildScript(); // System.out.println(script); /* 运行javascript脚本，结果为true，则继续执行下面的发送通知逻辑，结果为false，则跳过，不发送通知 **/ - if (!RunScriptUtil.runScript(script)) { + if (!Boolean.parseBoolean(JavascriptUtil.runScript(new JSONObject(), "return " + script).toString())) { notifyAuditList.add(notifyAuditMessage + " 通知设置ID为" + notifyObj.getId() + "的通知条件判断结果为false，不触发通知"); continue; } -- Gitee From 7260be6b7291789d7c096d96308513a7f384ea3b Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Mon, 16 Jun 2025 17:10:24 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E7=94=A8JavascriptU?= =?UTF-8?q?til=E7=B1=BB=E6=9B=BF=E6=8D=A2RunScriptUtil=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1444983029071872]用JavascriptUtil类替换RunScriptUtil类 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1444983029071872 --- src/main/java/neatlogic/framework/util/ConditionUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/neatlogic/framework/util/ConditionUtil.java b/src/main/java/neatlogic/framework/util/ConditionUtil.java index 4390653af..90956cdda 100644 --- a/src/main/java/neatlogic/framework/util/ConditionUtil.java +++ b/src/main/java/neatlogic/framework/util/ConditionUtil.java @@ -21,7 +21,7 @@ public class ConditionUtil { JSONObject paramObj = new JSONObject(); paramObj.put("data", paramData); Object returnValue = JavascriptUtil.runScript(paramObj, expression); - return Boolean.parseBoolean(returnValue.toString()); + return Boolean.parseBoolean(returnValue != null ? returnValue.toString() : "false"); //JavascriptUtil.runExpression(paramData,) } return false; -- Gitee From 579e3c1d96fdfe48f1fc600c2209223737cbf831 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Mon, 16 Jun 2025 17:12:48 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E7=94=A8JavascriptU?= =?UTF-8?q?til=E7=B1=BB=E6=9B=BF=E6=8D=A2RunScriptUtil=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1444983029071872]用JavascriptUtil类替换RunScriptUtil类 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1444983029071872 --- src/main/java/neatlogic/framework/util/NotifyPolicyUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/neatlogic/framework/util/NotifyPolicyUtil.java b/src/main/java/neatlogic/framework/util/NotifyPolicyUtil.java index 73a1ea7a2..9836a898d 100644 --- a/src/main/java/neatlogic/framework/util/NotifyPolicyUtil.java +++ b/src/main/java/neatlogic/framework/util/NotifyPolicyUtil.java @@ -149,7 +149,8 @@ public class NotifyPolicyUtil { String script = conditionConfig.buildScript(); // System.out.println(script); /* 运行javascript脚本，结果为true，则继续执行下面的发送通知逻辑，结果为false，则跳过，不发送通知 **/ - if (!Boolean.parseBoolean(JavascriptUtil.runScript(new JSONObject(), "return " + script).toString())) { + Object returnValue = JavascriptUtil.runScript(new JSONObject(), "return " + script); + if (!Boolean.parseBoolean(returnValue != null ? returnValue.toString() : "false")) { notifyAuditList.add(notifyAuditMessage + " 通知设置ID为" + notifyObj.getId() + "的通知条件判断结果为false，不触发通知"); continue; } -- Gitee