From 25ebef6b41c0615f29d2799d968694cc1647e234 Mon Sep 17 00:00:00 2001
From: shaohuzhang1 <80892890+shaohuzhang1@users.noreply.github.com>
Date: Tue, 2 Jul 2024 10:27:48 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E3=80=90=E5=BA=94=E7=94=A8=E7=BC=96?=
 =?UTF-8?q?=E6=8E=92=E3=80=91=E5=88=A4=E6=96=AD=E5=99=A8=E5=88=86=E6=94=AF?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E7=BB=93=E6=9E=9C=E9=94=99=E8=AF=AF=20(#680)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../flow/step_node/condition_node/compare/__init__.py       | 6 +++++-
 .../step_node/condition_node/compare/is_not_null_compare.py | 4 ++--
 .../step_node/condition_node/compare/is_null_compare.py     | 4 ++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/apps/application/flow/step_node/condition_node/compare/__init__.py b/apps/application/flow/step_node/condition_node/compare/__init__.py
index b2c464b41..0f61962fb 100644
--- a/apps/application/flow/step_node/condition_node/compare/__init__.py
+++ b/apps/application/flow/step_node/condition_node/compare/__init__.py
@@ -18,6 +18,10 @@ from .len_gt_compare import *
 from .len_le_compare import *
 from .len_lt_compare import *
 from .len_equal_compare import *
+from .is_not_null_compare import *
+from .is_null_compare import *
 
 compare_handle_list = [GECompare(), GTCompare(), ContainCompare(), EqualCompare(), LTCompare(), LECompare(),
-                       LenLECompare(), LenGECompare(), LenEqualCompare(), LenGTCompare(), LenLTCompare()]
+                       LenLECompare(), LenGECompare(), LenEqualCompare(), LenGTCompare(), LenLTCompare(),
+                       IsNullCompare(),
+                       IsNotNullCompare()]
diff --git a/apps/application/flow/step_node/condition_node/compare/is_not_null_compare.py b/apps/application/flow/step_node/condition_node/compare/is_not_null_compare.py
index 9c281e381..5dec26713 100644
--- a/apps/application/flow/step_node/condition_node/compare/is_not_null_compare.py
+++ b/apps/application/flow/step_node/condition_node/compare/is_not_null_compare.py
@@ -17,5 +17,5 @@ class IsNotNullCompare(Compare):
         if compare == 'is_not_null':
             return True
 
-    def compare(self, source_value, compare, target_value=None):
-        return source_value is not None
+    def compare(self, source_value, compare, target_value):
+        return source_value is not None and len(source_value) > 0
diff --git a/apps/application/flow/step_node/condition_node/compare/is_null_compare.py b/apps/application/flow/step_node/condition_node/compare/is_null_compare.py
index 6d49de605..c463f3fda 100644
--- a/apps/application/flow/step_node/condition_node/compare/is_null_compare.py
+++ b/apps/application/flow/step_node/condition_node/compare/is_null_compare.py
@@ -17,5 +17,5 @@ class IsNullCompare(Compare):
         if compare == 'is_null':
             return True
 
-    def compare(self, source_value, compare, target_value=None):
-        return source_value is None
+    def compare(self, source_value, compare, target_value):
+        return source_value is None or len(source_value) == 0