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 0a86aa3071afc02c0833cda310e5dd53589fafb0..849a78f220dae877e0c95c5bd1ddbbe68bc5aa50 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());