From fda6fda5b1d65be441afa2ab37d3c763fe3e11d2 Mon Sep 17 00:00:00 2001
From: opensnail <598092184@qq.com>
Date: Mon, 1 Jul 2024 15:52:46 +0800
Subject: [PATCH] =?UTF-8?q?fix(sj=5F1.1.0-beta2):=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=86=B3=E7=AD=96=E7=9A=84=E8=8A=82=E7=82=B9=E5=9C=A8=E7=BA=BF?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../aizuda/snailjob/server/common/dto/DecisionConfig.java    | 5 ++++-
 .../server/web/service/impl/WorkflowServiceImpl.java         | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

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 38207027..8c3509ba 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<String, Object> 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 ebb8e144..8b2ffce1 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());