diff --git a/src/main/java/neatlogic/module/cmdb/api/cicatalog/ListCiCatalogAndCiForTreeApi.java b/src/main/java/neatlogic/module/cmdb/api/cicatalog/ListCiCatalogAndCiForTreeApi.java index f3740e833ebcb3212a60a2d05ec9bbe1068adc46..b3d3aa099253a4a6eb7c4c45680000e4c742225f 100644 --- a/src/main/java/neatlogic/module/cmdb/api/cicatalog/ListCiCatalogAndCiForTreeApi.java +++ b/src/main/java/neatlogic/module/cmdb/api/cicatalog/ListCiCatalogAndCiForTreeApi.java @@ -109,14 +109,14 @@ public class ListCiCatalogAndCiForTreeApi extends PrivateApiComponentBase { } if (CollectionUtils.isNotEmpty(catalogList)) { - for (CiCatalogNodeVo node : catalogList) { - node.setType(CiCatalogNodeVo.CATALOG); + for (CiCatalogNodeVo node : hasCatalogCiNodeList) { CiCatalogNodeVo parent = id2NodeMap.get(node.getParentId()); if (parent != null) { parent.addChild(node); } } - for (CiCatalogNodeVo node : hasCatalogCiNodeList) { + for (CiCatalogNodeVo node : catalogList) { + node.setType(CiCatalogNodeVo.CATALOG); CiCatalogNodeVo parent = id2NodeMap.get(node.getParentId()); if (parent != null) { parent.addChild(node);