Merge remote-tracking branch 'origin/main'

This commit is contained in:
limengnan 2025-05-21 10:26:55 +08:00
commit 3a82816fd6

View File

@ -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;
}