From 182fdd14755c98b61d8c7843d733dce88b6a1c7d Mon Sep 17 00:00:00 2001
From: linbangquan <1437892690@qq.com>
Date: Sun, 17 Dec 2023 10:54:38 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E7=9F=A9=E9=98=B5=E6=8E=A5=E5=8F=A3=EF=BC=8C?=
 =?UTF-8?q?=E9=80=9A=E8=BF=87=E4=B8=8B=E6=8B=89=E6=A1=86=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E6=96=87=E6=9C=AC=E6=9F=A5=E8=AF=A2=E4=B8=8B=E6=8B=89=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9=EF=BC=8C=E6=94=AF=E6=8C=81=E6=89=B9=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1025398161244160]增加一个矩阵接口，通过下拉框显示文本查询下拉选项，支持批量 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1025398161244160
---
 .../framework/matrix/handler/CustomDataSourceHandler.java       | 2 +-
 .../framework/matrix/handler/ExternalDataSourceHandler.java     | 2 +-
 .../framework/matrix/handler/PrivateDataSourceHandler.java      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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 9b743e224..cc7c63d70 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 97a8a7301..452a2861e 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 e29805a32..2759bb7a1 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);
-- 
Gitee