From c6728a263c76a5ed5f251e36a2895d2e3469a3e3 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Mon, 31 Oct 2022 21:57:52 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=88=91=E7=9A=84=E5=88=86=E4=BA=AB):=20?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=AF=B9=E5=B7=B2=E8=A2=AB=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E7=9A=84=E7=9B=AE=E6=A0=87=E5=88=86=E4=BA=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/ext/ExtPanelShareMapper.xml   | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/backend/src/main/java/io/dataease/ext/ExtPanelShareMapper.xml b/backend/src/main/java/io/dataease/ext/ExtPanelShareMapper.xml
index 1399a0a9d2..ef1ae982ad 100644
--- a/backend/src/main/java/io/dataease/ext/ExtPanelShareMapper.xml
+++ b/backend/src/main/java/io/dataease/ext/ExtPanelShareMapper.xml
@@ -61,11 +61,23 @@
     </select>
 
     <select id="queryOut" resultMap="treeNodeMap">
-        select distinct s.panel_group_id as id, g.name, g.status
-        from panel_share s
-        left join panel_group g on g.id = s.panel_group_id
-        where ( s.granter is not null and s.granter = #{userName} ) or ( s.granter is null and g.create_by = #{userName} )
-        order by s.create_time desc
+        select id, name, status
+        from (select distinct s.panel_group_id as id,
+                              g.name,
+                              g.status,
+                              (
+                                  CASE s.type
+                                      WHEN 0 THEN (select nick_name from sys_user where user_id = s.target_id)
+                                      WHEN 1 THEN (select name from sys_role where role_id = s.target_id)
+                                      WHEN 2 THEN (select name from sys_dept where dept_id = s.target_id)
+                                      END
+                                  )            as target_name
+              from panel_share s
+                       left join panel_group g on g.id = s.panel_group_id
+              where (s.granter is not null and s.granter = #{userName})
+                 or (s.granter is null and g.create_by = #{userName})
+              order by s.create_time desc) query_temp
+        where target_name is not null
 
     </select>