ThbTech/gis-bi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
root 2025-05-21 16:45:10 +08:00
commit 8c35dc4d5e
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/core-backend/src/main/java/io/gisbi/application/system/service/impl/OrganizationServiceImpl.java
View File

@ -59,8 +59,6 @@ public class OrganizationServiceImpl extends ServiceImpl<OrganizationMapper, Org
return new ArrayList<>(); return new ArrayList<>();
} }
List<Map<String, Object>> result = new ArrayList<>();
for (Map<String, Object> item : listMap) { for (Map<String, Object> item : listMap) {
Object idObj = item.get("id"); Object idObj = item.get("id");
// 避免空指针 // 避免空指针
@ -69,11 +67,11 @@ public class OrganizationServiceImpl extends ServiceImpl<OrganizationMapper, Org
} }
List<Map<String, Object>> childList = child(idObj.toString(), appId, orgname); List<Map<String, Object>> childList = child(idObj.toString(), appId, orgname);
item.put("childList", childList); // 添加新列 子集 item.put("childList", childList); // 添加新列 子集
if (childList != null && !childList.isEmpty()) { // if (childList != null && !childList.isEmpty()) {
result.add(item); // 仅保留有子节点的数据 // listMap.add(item); // 仅保留有子节点的数据
// }
} }
} return listMap;
return result;
} }