Merge remote-tracking branch 'origin/main'

This commit is contained in:
limengnan 2025-05-21 16:21:50 +08:00
commit 1ffec4371e

View File

@ -67,9 +67,9 @@ 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()) {
listMap.add(item); // 仅保留有子节点的数据 // listMap.add(item); // 仅保留有子节点的数据
} // }
} }
return listMap; return listMap;
} }