From 6a8eb3d1ae9a51ac20670820e0e1623600f6b5eb Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Wed, 27 Mar 2024 18:10:37 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E9=A1=B9=E7=B1=BB=E5=9E=8B=E7=9F=A9=E9=98=B5=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1121748286668800]配置项类型矩阵过滤条件异常 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1121748286668800 --- .../module/cmdb/matrix/handler/CiDataSourceHandler.java | 3 ++- 1 file changed, 2 insertions(+), 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 60a46fc1..1891e764 100644 --- a/src/main/java/neatlogic/module/cmdb/matrix/handler/CiDataSourceHandler.java +++ b/src/main/java/neatlogic/module/cmdb/matrix/handler/CiDataSourceHandler.java @@ -1048,9 +1048,9 @@ public class CiDataSourceHandler extends MatrixDataSourceHandlerBase { private AttrFilterVo convertAttrFilter(AttrVo attrVo, String expression, List valueList) { AttrFilterVo attrFilterVo = new AttrFilterVo(); attrFilterVo.setAttrId(attrVo.getId()); - attrFilterVo.setExpression(expression); if (Objects.equals(expression, SearchExpression.NULL.getExpression()) || Objects.equals(expression, SearchExpression.NOTNULL.getExpression())) { + attrFilterVo.setExpression(expression); return attrFilterVo; } if (StringUtils.isBlank(expression)) { @@ -1102,6 +1102,7 @@ public class CiDataSourceHandler extends MatrixDataSourceHandlerBase { } else { attrFilterVo.setValueList(valueList); } + attrFilterVo.setExpression(expression); return attrFilterVo; } -- Gitee