diff --git a/src/main/java/neatlogic/module/process/stephandler/component/ConditionProcessComponent.java b/src/main/java/neatlogic/module/process/stephandler/component/ConditionProcessComponent.java index 37a7a0a8701c1e74de7e06aa81639a374db34a8e..e88b1ed6d89cab45e248ff202e0cd64a12ca5cbb 100644 --- a/src/main/java/neatlogic/module/process/stephandler/component/ConditionProcessComponent.java +++ b/src/main/java/neatlogic/module/process/stephandler/component/ConditionProcessComponent.java @@ -167,7 +167,8 @@ public class ConditionProcessComponent extends ProcessStepHandlerBase { /* 将参数名称、表达式、值的value翻译成对应text,目前条件步骤生成活动时用到**/ translate(conditionConfigVo, currentProcessTaskStepVo.getProcessTaskId(), formTag); // ((false || true) || (true && false) || (true || false)) - canRun = Boolean.parseBoolean(JavascriptUtil.runScript(new JSONObject(), "return " + script).toString()); + Object returnValue = JavascriptUtil.runScript(new JSONObject(), "return " + script); + canRun = Boolean.parseBoolean(returnValue != null ? returnValue.toString() : "false"); ruleObj.put("result", canRun); } catch (Exception e) { logger.error(e.getMessage(), e); diff --git a/src/main/java/neatlogic/module/process/thread/ProcessTaskSlaThread.java b/src/main/java/neatlogic/module/process/thread/ProcessTaskSlaThread.java index 1d193908ab55d76dd0424dc8083c1ff6b294b079..9cca47d3924d02969341f8e84295ef9c23f5d91d 100644 --- a/src/main/java/neatlogic/module/process/thread/ProcessTaskSlaThread.java +++ b/src/main/java/neatlogic/module/process/thread/ProcessTaskSlaThread.java @@ -157,7 +157,8 @@ public class ProcessTaskSlaThread extends NeatLogicThread { ConditionConfigVo conditionConfigVo = new ConditionConfigVo(policyObj); String script = conditionConfigVo.buildScript(); // ((false || true) || (true && false) || (true || false)) - isHit = Boolean.parseBoolean(JavascriptUtil.runScript(new JSONObject(), "return " + script).toString()); + Object returnValue = JavascriptUtil.runScript(new JSONObject(), "return " + script); + isHit = Boolean.parseBoolean(returnValue != null ? returnValue.toString() : "false"); } catch (Exception e) { logger.error(e.getMessage(), e); } finally {