From d94955e69ae3629a9ca6a5b59d88861170687454 Mon Sep 17 00:00:00 2001
From: lilin <succ_secret@163.com>
Date: Wed, 21 May 2025 10:16:14 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E4=BB=A5=E5=90=8E=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81=EF=BC=8C?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/service/impl/OrganizationServiceImpl.java        | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/core/core-backend/src/main/java/io/gisbi/application/system/service/impl/OrganizationServiceImpl.java b/core/core-backend/src/main/java/io/gisbi/application/system/service/impl/OrganizationServiceImpl.java
index 732d9cb..5cbc7db 100644
--- a/core/core-backend/src/main/java/io/gisbi/application/system/service/impl/OrganizationServiceImpl.java
+++ b/core/core-backend/src/main/java/io/gisbi/application/system/service/impl/OrganizationServiceImpl.java
@@ -59,8 +59,6 @@ public class OrganizationServiceImpl extends ServiceImpl<OrganizationMapper, Org
             return new ArrayList<>();
         }
 
-        List<Map<String, Object>> result = new ArrayList<>();
-
         for (Map<String, Object> item : listMap) {
             Object idObj = item.get("id");
             // 避免空指针
@@ -70,10 +68,10 @@ public class OrganizationServiceImpl extends ServiceImpl<OrganizationMapper, Org
             List<Map<String, Object>> childList = child(idObj.toString(), appId, orgname);
             item.put("childList", childList); // 添加新列 子集
             if (childList != null && !childList.isEmpty()) {
-                result.add(item); // 仅保留有子节点的数据
+                listMap.add(item); // 仅保留有子节点的数据
             }
         }
-        return result;
+        return listMap;
     }
 
 

From 15ae73cc1592a90fe97c115714d056cd8ec4328e Mon Sep 17 00:00:00 2001
From: lilin <succ_secret@163.com>
Date: Wed, 21 May 2025 16:09:23 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/service/impl/OrganizationServiceImpl.java        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/core-backend/src/main/java/io/gisbi/application/system/service/impl/OrganizationServiceImpl.java b/core/core-backend/src/main/java/io/gisbi/application/system/service/impl/OrganizationServiceImpl.java
index 5cbc7db..fda4d79 100644
--- a/core/core-backend/src/main/java/io/gisbi/application/system/service/impl/OrganizationServiceImpl.java
+++ b/core/core-backend/src/main/java/io/gisbi/application/system/service/impl/OrganizationServiceImpl.java
@@ -67,9 +67,9 @@ public class OrganizationServiceImpl extends ServiceImpl<OrganizationMapper, Org
             }
             List<Map<String, Object>> childList = child(idObj.toString(), appId, orgname);
             item.put("childList", childList); // 添加新列 子集
-            if (childList != null && !childList.isEmpty()) {
-                listMap.add(item); // 仅保留有子节点的数据
-            }
+//            if (childList != null && !childList.isEmpty()) {
+//                listMap.add(item); // 仅保留有子节点的数据
+//            }
         }
         return listMap;
     }