From 56aeb3dd2380fdfc2eb817a86fb680ae475de7cd Mon Sep 17 00:00:00 2001 From: linbangquan <1437892690@qq.com> Date: Sun, 17 Dec 2023 10:52:21 +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 --- .../module/cmdb/matrix/handler/CiDataSourceHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/neatlogic/module/cmdb/matrix/handler/CiDataSourceHandler.java b/src/main/java/neatlogic/module/cmdb/matrix/handler/CiDataSourceHandler.java index dee13462..92876f53 100644 --- a/src/main/java/neatlogic/module/cmdb/matrix/handler/CiDataSourceHandler.java +++ b/src/main/java/neatlogic/module/cmdb/matrix/handler/CiDataSourceHandler.java @@ -804,7 +804,7 @@ public class CiDataSourceHandler 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()))); } for (MatrixFilterVo matrixFilterVo : filterList) { -- Gitee