diff --git a/backend/src/main/java/com/yfd/platform/common/MicroservicDynamicSQLMapper.java b/backend/src/main/java/com/yfd/platform/common/MicroservicDynamicSQLMapper.java index 56b60176..59e435bd 100644 --- a/backend/src/main/java/com/yfd/platform/common/MicroservicDynamicSQLMapper.java +++ b/backend/src/main/java/com/yfd/platform/common/MicroservicDynamicSQLMapper.java @@ -45,7 +45,8 @@ public interface MicroservicDynamicSQLMapper { default List getAllListWithResultType(String sql, Map map, Class resultType) { - return convertList(getAllList(sql, map), resultType); + List> allList = getAllList(sql, map); + return convertList(allList, resultType); } @Select({"select count(1) count from ${sql} and ${ew.sqlSegment}"}) diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/vd/service/impl/VdMonitorServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_env/vd/service/impl/VdMonitorServiceImpl.java index 549b34fa..0a674c47 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_env/vd/service/impl/VdMonitorServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_env/vd/service/impl/VdMonitorServiceImpl.java @@ -1179,26 +1179,33 @@ public class VdMonitorServiceImpl implements VdMonitorService { private List normalizeValues(Object value) { List values = new ArrayList<>(); + appendNormalizedValues(values, value); + return values; + } + + private void appendNormalizedValues(List values, Object value) { + if (value == null) { + return; + } if (value instanceof List list) { for (Object item : list) { - if (item != null) { - values.add(item); - } + appendNormalizedValues(values, item); } - return values; + return; } if (value instanceof Object[] array) { for (Object item : array) { - if (item != null) { - values.add(item); - } + appendNormalizedValues(values, item); } - return values; + return; } - if (value != null) { - values.add(value); + if (value instanceof String text) { + if (StrUtil.isNotBlank(text)) { + values.add(text); + } + return; } - return values; + values.add(value); } private String mapVdTreeColumn(String field) {