From b329d475c8b9223ad54d2677da98ffc85aef714b Mon Sep 17 00:00:00 2001
From: tangwei <tangwei0654@163.com>
Date: Thu, 25 Jun 2026 18:00:28 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E8=A7=86=E9=A2=91?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/MicroservicDynamicSQLMapper.java   |  3 +-
 .../vd/service/impl/VdMonitorServiceImpl.java | 29 ++++++++++++-------
 2 files changed, 20 insertions(+), 12 deletions(-)

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<T> {
     default <R> List<R> getAllListWithResultType(String sql,
                                                  Map<String, Object> map,
                                                  Class<R> resultType) {
-        return convertList(getAllList(sql, map), resultType);
+        List<Map<String, Object>> 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<Object> normalizeValues(Object value) {
         List<Object> values = new ArrayList<>();
+        appendNormalizedValues(values, value);
+        return values;
+    }
+
+    private void appendNormalizedValues(List<Object> 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) {