From 8b6f21558f175cfb22533a2bbac803c03624b9e9 Mon Sep 17 00:00:00 2001 From: linbangquan <1437892690@qq.com> Date: Tue, 26 Dec 2023 11:07:29 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF-?= =?UTF-8?q?=E5=90=8C=E7=BA=A7=E7=9B=AE=E5=BD=95=E4=B8=8B=EF=BC=8C=E6=A8=A1?= =?UTF-8?q?=E5=9E=8B=E6=8E=92=E5=9C=A8=E5=89=8D=E9=9D=A2=EF=BC=8C=E5=AD=90?= =?UTF-8?q?=E7=9B=AE=E5=BD=95=E6=8E=92=E5=9C=A8=E5=90=8E=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1054883598270464]后端-同级目录下，模型排在前面，子目录排在后面 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1054883598270464 --- .../cmdb/api/cicatalog/ListCiCatalogAndCiForTreeApi.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 f3740e83..b3d3aa09 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); -- Gitee