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 60a46fc131b9105e6cb60bb40286ef4e9661ccdf..1891e7644171e577cf7f65a9e5346b6f26fabc0b 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; }