From 7d133a26d0b98a83446509ed5fe735d7a3b210f8 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Wed, 23 Oct 2024 17:51:12 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E3=80=90=E6=95=B0=E6=8D=AE=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E4=B8=AD=E5=BF=83=E3=80=91=E8=A7=A3=E5=86=B3=E6=AD=BB?= =?UTF-8?q?=E5=BE=AA=E7=8E=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/dataset/manage/DatasetGroupManage.java | 3 +++ .../dataease/visualization/server/DataVisualizationServer.java | 3 +++ 2 files changed, 6 insertions(+) diff --git a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetGroupManage.java b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetGroupManage.java index dbaf3bbf26..a4bde77608 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetGroupManage.java +++ b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetGroupManage.java @@ -559,6 +559,9 @@ public class DatasetGroupManage { return; } fullName.add(parent.getName()); + if (parent.getId().equals(parent.getPid())) { + return; + } if (parent.getPid() != null && parent.getPid() != 0) { geFullName(parent.getPid(), fullName); } diff --git a/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java b/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java index 9d4b4a2444..fbaa3ef860 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java @@ -781,6 +781,9 @@ public class DataVisualizationServer implements DataVisualizationApi { List list = new ArrayList<>(); DataVisualizationInfo dataVisualizationInfo = visualizationInfoMapper.selectById(id); list.add(dataVisualizationInfo); + if (dataVisualizationInfo.getPid().equals(dataVisualizationInfo.getId())) { + return list; + } getParent(list, dataVisualizationInfo); Collections.reverse(list); return list;