diff --git a/src/main/java/neatlogic/framework/util/ConditionUtil.java b/src/main/java/neatlogic/framework/util/ConditionUtil.java index 4390653afe0763479c47e556b2eb54203004ec8b..90956cdda9c200831aace12aefb695e903488e81 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; diff --git a/src/main/java/neatlogic/framework/util/NotifyPolicyUtil.java b/src/main/java/neatlogic/framework/util/NotifyPolicyUtil.java index 73a1ea7a25af572d5d64eeebeff68079c16918af..9836a898dc91a0b0f2f3973d3d6b83554d39c1e8 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; }