From 44ceddf7f25b6e3cb5b6d3cd3dbbed3e2fe726ae Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Tue, 6 May 2025 11:25:49 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=B8=8B=E6=8B=89=E6=A0=91=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E6=9C=AB=E7=BA=A7=E4=B8=BA=E7=A9=BA=E7=9A=84=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=20#15959?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/dataset/manage/DatasetDataManage.java    | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java
index c44e3d0e9a..83b9ee1a06 100644
--- a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java
+++ b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java
@@ -1181,13 +1181,16 @@ public class DatasetDataManage {
         Set<String> pkSet = new HashSet<>();
         rows = rows.stream().filter(row -> {
             boolean hasEmpty = false;
+            int emptyCount = 0;
             for (String s : row) {
                 if (StringUtils.isBlank(s)) {
-                    hasEmpty = true;
-                    break;
+                    emptyCount++;
+                    hasEmpty = true; // 标记已遇到第一个null
+                } else if (hasEmpty) {
+                    return false; // 在null后出现非null元素，不符合要求
                 }
             }
-            return !hasEmpty;
+            return emptyCount != row.length;
         }).toList();
         List<BaseTreeNodeDTO> treeNodes = rows.stream().map(row -> buildTreeNode(row, pkSet)).flatMap(Collection::stream).collect(Collectors.toList());
         List<BaseTreeNodeDTO> tree = DatasetUtils.mergeDuplicateTree(treeNodes, "root");