From 2009f8ed94803f6262566b2e39ec61e8356b35db Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Wed, 27 Mar 2024 10:17:47 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E7=9F=A9=E9=98=B5?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E8=A1=A8=E5=8D=95=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E5=BC=95=E7=94=A8=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A7=86=E5=9B=BE?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90=EF=BC=8C=E5=85=B3=E9=94=AE=E5=AD=97?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=97=A0=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1121042645352448]矩阵管理-表单组件引用自定义视图数据源，关键字搜索无效 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1121042645352448 --- .../matrix/handler/CmdbCustomViewDataSourceHandler.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/neatlogic/module/cmdb/matrix/handler/CmdbCustomViewDataSourceHandler.java b/src/main/java/neatlogic/module/cmdb/matrix/handler/CmdbCustomViewDataSourceHandler.java index 0a86aa30..849a78f2 100644 --- a/src/main/java/neatlogic/module/cmdb/matrix/handler/CmdbCustomViewDataSourceHandler.java +++ b/src/main/java/neatlogic/module/cmdb/matrix/handler/CmdbCustomViewDataSourceHandler.java @@ -341,9 +341,15 @@ public class CmdbCustomViewDataSourceHandler extends MatrixDataSourceHandlerBase dataList.addAll(mapList); } } else { + List filterList = dataVo.getFilterList(); + String keywordColumn = dataVo.getKeywordColumn(); + if (StringUtils.isNotBlank(keywordColumn) && StringUtils.isNotBlank(dataVo.getKeyword())) { + MatrixFilterVo matrixFilterVo = new MatrixFilterVo(keywordColumn, Expression.LIKE.getExpression(), Arrays.asList(dataVo.getKeyword())); + filterList.add(matrixFilterVo); + } CustomViewConditionVo customViewConditionVo = new CustomViewConditionVo(); customViewConditionVo.setCustomViewId(matrixCmdbCustomViewVo.getCustomViewId()); - List attrFilterList = convertAttrFilter(matrixCmdbCustomViewVo.getCustomViewId(), matrixAttributeList, dataVo.getFilterList(), matrixUuid); + List attrFilterList = convertAttrFilter(matrixCmdbCustomViewVo.getCustomViewId(), matrixAttributeList, filterList, matrixUuid); customViewConditionVo.setAttrFilterList(attrFilterList); customViewConditionVo.setCurrentPage(dataVo.getCurrentPage()); customViewConditionVo.setPageSize(dataVo.getPageSize()); -- Gitee