diff --git a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/dto/DecisionConfig.java b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/dto/DecisionConfig.java index 382070274..8c3509baf 100644 --- a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/dto/DecisionConfig.java +++ b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/dto/DecisionConfig.java @@ -34,6 +34,9 @@ public class DecisionConfig { */ private Integer defaultDecision; - private Map check; + /** + * 决策节点校验内容 + */ + private String checkContent; } diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/WorkflowServiceImpl.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/WorkflowServiceImpl.java index ebb8e1440..8b2ffce11 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/WorkflowServiceImpl.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/WorkflowServiceImpl.java @@ -314,7 +314,7 @@ public class WorkflowServiceImpl implements WorkflowService { Assert.notNull(realExpressionEngine, () -> new SnailJobServerException("表达式引擎不存在")); ExpressionInvocationHandler invocationHandler = new ExpressionInvocationHandler(realExpressionEngine); ExpressionEngine expressionEngine = ExpressionFactory.getExpressionEngine(invocationHandler); - expressionEngine.eval(decisionConfig.getNodeExpression(), StrUtil.EMPTY); + expressionEngine.eval(decisionConfig.getNodeExpression(), decisionConfig.getCheckContent()); } catch (Exception e) { SnailJobLog.LOCAL.error("表达式异常. [{}]", decisionConfig.getNodeExpression(), e); return Pair.of(StatusEnum.NO.getStatus(), e.getMessage());