diff --git a/api/app/core/workflow/expression_evaluator.py b/api/app/core/workflow/expression_evaluator.py
index c8875d79..81ab25dc 100644
--- a/api/app/core/workflow/expression_evaluator.py
+++ b/api/app/core/workflow/expression_evaluator.py
@@ -5,6 +5,7 @@
 """
 
 import logging
+import re
 from typing import Any
 
 from simpleeval import simple_eval, NameNotDefined, InvalidExpression
@@ -59,9 +60,10 @@ class ExpressionEvaluator:
         """
         # 移除 Jinja2 模板语法的花括号（如果存在）
         expression = expression.strip()
-        if expression.startswith("{{") and expression.endswith("}}"):
-            expression = expression[2:-2].strip()
-        
+        # "{{system.message}} == {{ user.messge }}" -> "system.message == user.message"
+        pattern = r"\{\{\s*(.*?)\s*\}\}"
+        expression = re.sub(pattern, r"\1", expression).strip()
+
         # 构建命名空间上下文
         context = {
             "var": variables,                    # 用户变量