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 ded7d5b0c6bf569b5e49766d4693a07b79a8431b..37a7a0a8701c1e74de7e06aa81639a374db34a8e 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,7 @@ public class ConditionProcessComponent extends ProcessStepHandlerBase { /* 将参数名称、表达式、值的value翻译成对应text,目前条件步骤生成活动时用到**/ translate(conditionConfigVo, currentProcessTaskStepVo.getProcessTaskId(), formTag); // ((false || true) || (true && false) || (true || false)) - canRun = RunScriptUtil.runScript(script); + canRun = Boolean.parseBoolean(JavascriptUtil.runScript(new JSONObject(), "return " + script).toString()); 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 d918a56b95c04b529c38bc31fec3e189ab122beb..1d193908ab55d76dd0424dc8083c1ff6b294b079 100644 --- a/src/main/java/neatlogic/module/process/thread/ProcessTaskSlaThread.java +++ b/src/main/java/neatlogic/module/process/thread/ProcessTaskSlaThread.java @@ -35,8 +35,8 @@ import neatlogic.framework.scheduler.core.SchedulerManager; import neatlogic.framework.scheduler.dto.JobObject; import neatlogic.framework.scheduler.exception.ScheduleHandlerNotFoundException; import neatlogic.framework.transaction.util.TransactionUtil; -import neatlogic.framework.util.RunScriptUtil; import neatlogic.framework.util.WorkTimeUtil; +import neatlogic.framework.util.javascript.JavascriptUtil; import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.module.process.dao.mapper.processtask.ProcessTaskSlaMapper; import neatlogic.module.process.schedule.plugin.ProcessTaskSlaNotifyJob; @@ -157,7 +157,7 @@ public class ProcessTaskSlaThread extends NeatLogicThread { ConditionConfigVo conditionConfigVo = new ConditionConfigVo(policyObj); String script = conditionConfigVo.buildScript(); // ((false || true) || (true && false) || (true || false)) - isHit = RunScriptUtil.runScript(script); + isHit = Boolean.parseBoolean(JavascriptUtil.runScript(new JSONObject(), "return " + script).toString()); } catch (Exception e) { logger.error(e.getMessage(), e); } finally {