From 7aaad18dd90466351474200fd8073da1a8d2dae3 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 28 Feb 2022 11:35:32 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=87=AA=E5=B7=B1=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E7=9A=84=E4=BB=AA=E8=A1=A8=E6=9D=BF=E5=8F=B3=E4=B8=8A=E8=A7=92?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E7=BC=96=E8=BE=91=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/base/mapper/ext/ExtPanelGroupMapper.java | 4 +++-
 .../java/io/dataease/base/mapper/ext/ExtPanelGroupMapper.xml  | 4 ++--
 .../java/io/dataease/service/panel/PanelGroupService.java     | 4 ++--
 frontend/src/api/panel/panel.js                               | 3 ++-
 frontend/src/views/link/view/index.vue                        | 3 ++-
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelGroupMapper.java b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelGroupMapper.java
index d03e7e7e06..a0ea1417e8 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelGroupMapper.java
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelGroupMapper.java
@@ -15,7 +15,7 @@ public interface ExtPanelGroupMapper {
     //会级联删除pid 下的所有数据
     int deleteCircle(@Param("pid") String pid);
 
-    PanelGroupDTO panelGroup(String id);
+    PanelGroupDTO findOneWithPrivileges(@Param("panelId") String panelId,@Param("userId") String userId);
 
     void copyPanelView(@Param("pid") String panelId);
 
@@ -24,4 +24,6 @@ public interface ExtPanelGroupMapper {
 
     List<PanelGroupDTO> panelGroupInit();
 
+
+
 }
diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelGroupMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelGroupMapper.xml
index defc52803c..07d97f2935 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelGroupMapper.xml
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelGroupMapper.xml
@@ -12,8 +12,8 @@
         <result column="is_default" property="isDefault"/>
     </resultMap>
 
-    <select id="panelGroup" resultMap="BaseResultMapDTO">
-        select panel_group.*,panel_group.name as label from panel_group where id =#{id}
+    <select id="findOneWithPrivileges" resultMap="BaseResultMapDTO">
+        select panel_group.*,panel_group.name as label , get_auths(panel_group.id,'panel',#{userId}) as `privileges` from panel_group where id =#{panelId}
     </select>
 
     <select id="panelGroupInit" resultMap="BaseResultMapDTO">
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 aedb1af684..b598aa41c1 100644
--- a/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
+++ b/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
@@ -206,9 +206,9 @@ public class PanelGroupService {
 
 
     public PanelGroupWithBLOBs findOne(String panelId) {
-        PanelGroupWithBLOBs panelGroupWithBLOBs = panelGroupMapper.selectByPrimaryKey(panelId);
+        PanelGroupWithBLOBs panelGroupWithBLOBs = extPanelGroupMapper.findOneWithPrivileges(panelId,String.valueOf(AuthUtils.getUser().getUserId()));
         if (panelGroupWithBLOBs != null && StringUtils.isNotEmpty(panelGroupWithBLOBs.getSource())) {
-            return panelGroupMapper.selectByPrimaryKey(panelGroupWithBLOBs.getSource());
+            return extPanelGroupMapper.findOneWithPrivileges(panelGroupWithBLOBs.getSource(),String.valueOf(AuthUtils.getUser().getUserId()));
         }
         return panelGroupWithBLOBs;
     }
diff --git a/frontend/src/api/panel/panel.js b/frontend/src/api/panel/panel.js
index 0a399b81af..e7962332a7 100644
--- a/frontend/src/api/panel/panel.js
+++ b/frontend/src/api/panel/panel.js
@@ -141,7 +141,8 @@ export function initPanelData(panelId, callback) {
     // 设置当前仪表板全局信息
     store.dispatch('panel/setPanelInfo', {
       id: response.data.id,
-      name: response.data.name
+      name: response.data.name,
+      privileges: response.data.privileges
     })
     // 刷新联动信息
     getPanelAllLinkageInfo(panelId).then(rsp => {
diff --git a/frontend/src/views/link/view/index.vue b/frontend/src/views/link/view/index.vue
index c522e56ba0..21a6fc1ad9 100644
--- a/frontend/src/views/link/view/index.vue
+++ b/frontend/src/views/link/view/index.vue
@@ -39,7 +39,8 @@ export default {
       loadResource(this.resourceId).then(res => {
         this.$store.dispatch('panel/setPanelInfo', {
           id: res.data.id,
-          name: res.data.name
+          name: res.data.name,
+          privileges: res.data.privileges
         })
 
         panelInit(JSON.parse(res.data.panelData), JSON.parse(res.data.panelStyle))