diff --git a/src/main/java/neatlogic/module/framework/matrix/handler/CustomDataSourceHandler.java b/src/main/java/neatlogic/module/framework/matrix/handler/CustomDataSourceHandler.java
index 9b743e224f3bfa79e1e283910dcb12cdd1045570..cc7c63d70a5c121f3cc69d937f92a8a92d6028a9 100644
--- a/src/main/java/neatlogic/module/framework/matrix/handler/CustomDataSourceHandler.java
+++ b/src/main/java/neatlogic/module/framework/matrix/handler/CustomDataSourceHandler.java
@@ -486,7 +486,7 @@ public class CustomDataSourceHandler extends MatrixDataSourceHandlerBase {
                         if (CollectionUtils.isNotEmpty(valueList)) {
                             filterList.add(new MatrixFilterVo(textFieldFilter.getUuid(), SearchExpression.EQ.getExpression(), valueList));
                         } else {
-                            return resultList;
+                            continue;
                         }
                         dataVo.setKeyword(null);
                     } else {
diff --git a/src/main/java/neatlogic/module/framework/matrix/handler/ExternalDataSourceHandler.java b/src/main/java/neatlogic/module/framework/matrix/handler/ExternalDataSourceHandler.java
index 97a8a73011cc301f635e313a860eb5c81f678bc9..452a2861eb33077f1475c578877ab8d89e7b0320 100644
--- a/src/main/java/neatlogic/module/framework/matrix/handler/ExternalDataSourceHandler.java
+++ b/src/main/java/neatlogic/module/framework/matrix/handler/ExternalDataSourceHandler.java
@@ -341,7 +341,7 @@ public class ExternalDataSourceHandler extends MatrixDataSourceHandlerBase {
                     filterList.add(new MatrixFilterVo(valueFieldFilter.getUuid(), valueFieldFilter.getExpression(), Arrays.asList(valueFieldFilter.getValue())));
                 }
                 MatrixKeywordFilterVo textFieldFilter = defaultValueFilterVo.getTextFieldFilter();
-                if (textFieldFilter != null && !Objects.equals(valueFieldFilter.getUuid(), textFieldFilter.getUuid())) {
+                if (textFieldFilter != null && (valueFieldFilter == null || !Objects.equals(valueFieldFilter.getUuid(), textFieldFilter.getUuid()))) {
                     filterList.add(new MatrixFilterVo(textFieldFilter.getUuid(), textFieldFilter.getExpression(), Arrays.asList(textFieldFilter.getValue())));
                 }
 //                dataVo.setFilterList(filterList);
diff --git a/src/main/java/neatlogic/module/framework/matrix/handler/PrivateDataSourceHandler.java b/src/main/java/neatlogic/module/framework/matrix/handler/PrivateDataSourceHandler.java
index e29805a3291975c63500feb7c3f05fb8c6c9fc49..2759bb7a15a8ffb4b92a181c58dda545dcbe43d5 100644
--- a/src/main/java/neatlogic/module/framework/matrix/handler/PrivateDataSourceHandler.java
+++ b/src/main/java/neatlogic/module/framework/matrix/handler/PrivateDataSourceHandler.java
@@ -141,7 +141,7 @@ public class PrivateDataSourceHandler extends MatrixDataSourceHandlerBase {
                     filterList.add(new MatrixFilterVo(valueFieldFilter.getUuid(), valueFieldFilter.getExpression(), Arrays.asList(valueFieldFilter.getValue())));
                 }
                 MatrixKeywordFilterVo textFieldFilter = defaultValueFilterVo.getTextFieldFilter();
-                if (textFieldFilter != null && !Objects.equals(valueFieldFilter.getUuid(), textFieldFilter.getUuid())) {
+                if (textFieldFilter != null && (valueFieldFilter == null || !Objects.equals(valueFieldFilter.getUuid(), textFieldFilter.getUuid()))) {
                     filterList.add(new MatrixFilterVo(textFieldFilter.getUuid(), textFieldFilter.getExpression(), Arrays.asList(textFieldFilter.getValue())));
                 }
                 dataVo.setFilterList(filterList);