From ae49e8810acb4b8f8972f82a25e2fa16f69eb90d Mon Sep 17 00:00:00 2001
From: Wangjiahao <1522128093@qq.com>
Date: Tue, 23 May 2023 12:48:58 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E4=BB=AA=E8=A1=A8=E6=9D=BF=E7=9B=AE=E5=BD=95=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E5=90=8E=EF=BC=8C=E7=9B=AE=E5=BD=95=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?=E4=B8=8B=E7=9A=84=E4=BB=AA=E8=A1=A8=E6=9D=BF=E5=AF=B9=E5=BA=94?=
 =?UTF-8?q?=E7=9A=84=E9=BB=98=E8=AE=A4=E4=BB=AA=E8=A1=A8=E6=9D=BF=E5=8F=AF?=
 =?UTF-8?q?=E8=83=BD=E6=B2=A1=E6=9C=89=E8=B7=9F=E9=9A=8F=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=20#5171?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/io/dataease/ext/ExtPanelGroupMapper.java   | 2 ++
 .../src/main/java/io/dataease/ext/ExtPanelGroupMapper.xml    | 5 ++++-
 .../java/io/dataease/service/panel/PanelGroupService.java    | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.java b/backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.java
index a1fdf5af1a..8e62c241e3 100644
--- a/backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.java
+++ b/backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.java
@@ -17,6 +17,8 @@ public interface ExtPanelGroupMapper {
     //会级联删除pid 下的所有数据
     int deleteCircle(@Param("pid") String pid, @Param("nodeType") String nodeType);
 
+    int deleteLinkDefaultCircle(@Param("pid") String pid);
+
     int deleteCircleView(@Param("pid") String pid, @Param("nodeType") String nodeType);
 
     int deleteCircleViewCache(@Param("pid") String pid, @Param("nodeType") String nodeType);
diff --git a/backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.xml b/backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.xml
index 6b3d058df8..6e54ab20fb 100644
--- a/backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.xml
+++ b/backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.xml
@@ -202,6 +202,10 @@
         ORDER BY panel_group.node_type desc, CONVERT(panel_group.name using gbk)
     </select>
 
+    <delete id="deleteLinkDefaultCircle">
+        delete from panel_group where FIND_IN_SET(panel_group.source, GET_PANEL_GROUP_WITH_CHILDREN(#{pid}))
+    </delete>
+
     <delete id="deleteCircle">
         delete
         from panel_group
@@ -211,7 +215,6 @@
         panel_group.source = #{pid}
         <if test="nodeType == 'folder'">
             or FIND_IN_SET(panel_group.id, GET_PANEL_GROUP_WITH_CHILDREN(#{pid}))
-            or FIND_IN_SET(panel_group.source, GET_PANEL_GROUP_WITH_CHILDREN(#{pid}))
         </if>
     </delete>
 
diff --git a/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java b/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
index 7f22ac1a7a..964155492b 100644
--- a/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
+++ b/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
@@ -305,6 +305,7 @@ public class PanelGroupService {
         extPanelGroupMapper.deleteCircleView(id, nodeType);
         extPanelGroupMapper.deleteCircleViewCache(id, nodeType);
         // 同时会删除对应默认仪表盘
+        extPanelGroupMapper.deleteLinkDefaultCircle(id);
         extPanelGroupMapper.deleteCircle(id, nodeType);
         storeService.removeByPanelId(id);
         shareService.delete(id, null);