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