From c6fd782d3926a1d1ea58133655c7858cac6b8bba Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Wed, 28 Jul 2021 12:16:59 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=96=B0=E5=BB=BA=E8=A7=86=E5=9B=BE?=
 =?UTF-8?q?=E5=90=8E=E6=9D=83=E9=99=90=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/mapper/ext/ExtChartViewMapper.java   |  2 ++
 .../base/mapper/ext/ExtChartViewMapper.xml    | 19 +++++++++++++++++++
 .../service/chart/ChartViewService.java       | 10 ++++++++--
 frontend/src/views/chart/group/Group.vue      |  4 ++--
 4 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtChartViewMapper.java b/backend/src/main/java/io/dataease/base/mapper/ext/ExtChartViewMapper.java
index fdbb430fbc..ed9a4085ec 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtChartViewMapper.java
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtChartViewMapper.java
@@ -12,6 +12,8 @@ import java.util.List;
 public interface ExtChartViewMapper {
     List<ChartViewDTO> search(ChartViewRequest request);
 
+    ChartViewDTO searchOne(ChartViewRequest request);
+
     void chartCopy(@Param("newChartId")String newChartId,@Param("oldChartId")String oldChartId);
 
     @Select("select id from chart_view where table_id = #{tableId}")
diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtChartViewMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtChartViewMapper.xml
index f8de1cbaa0..1728fd92d4 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtChartViewMapper.xml
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtChartViewMapper.xml
@@ -8,6 +8,25 @@
         <result column="privileges" property="privileges"/>
     </resultMap>
 
+    <select id="searchOne" resultMap="BaseResultMapDTO">
+        select
+        id, `name`, scene_id, table_id, `type`, title, create_by, create_time, update_time,
+        style_priority,x_axis, y_axis, custom_attr, custom_style, custom_filter, snapshot,
+        get_auths(id,'chart',#{userId}) as `privileges`
+        from (select GET_V_AUTH_MODEL_ID_P_USE (#{userId}, 'chart') cids) t,chart_view
+        <where>
+            FIND_IN_SET(chart_view.id,cids)
+            <if test="sceneId != null">
+                and scene_id = #{sceneId,jdbcType=VARCHAR}
+            </if>
+            <if test="id != null">
+                and id = #{id,jdbcType=VARCHAR}
+            </if>
+        </where>
+        <if test="sort != null">
+            order by ${sort}
+        </if>
+    </select>
 
     <select id="search" resultMap="BaseResultMapDTO">
         select
diff --git a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
index 23716d853b..84dbbf0fd7 100644
--- a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
+++ b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
@@ -79,8 +79,7 @@ public class ChartViewService {
         Optional.ofNullable(chartView.getId()).ifPresent(id -> {
             CacheUtils.remove(JdbcConstants.VIEW_CACHE_KEY, id);
         });
-
-        return chartView;
+        return getOneWithPermission(chartView.getId());
     }
 
     public List<ChartViewDTO> list(ChartViewRequest chartViewRequest) {
@@ -115,6 +114,13 @@ public class ChartViewService {
         return chartViewMapper.selectByPrimaryKey(id);
     }
 
+    public ChartViewDTO getOneWithPermission(String id) {
+        ChartViewRequest chartViewRequest = new ChartViewRequest();
+        chartViewRequest.setId(id);
+        chartViewRequest.setUserId(String.valueOf(AuthUtils.getUser().getUserId()));
+        return extChartViewMapper.searchOne(chartViewRequest);
+    }
+
     public void delete(String id) {
         chartViewMapper.deleteByPrimaryKey(id);
     }
diff --git a/frontend/src/views/chart/group/Group.vue b/frontend/src/views/chart/group/Group.vue
index c06ffd53bb..8783ceddce 100644
--- a/frontend/src/views/chart/group/Group.vue
+++ b/frontend/src/views/chart/group/Group.vue
@@ -679,7 +679,7 @@ export default {
       }
     },
     sceneClick(data, node) {
-      this.$emit('switchComponent', { name: 'ChartEdit', param: { 'id': data.id }})
+      this.$emit('switchComponent', { name: 'ChartEdit', param: data })
     },
     reviewChartList() {
       if (this.$store.state.chart.chartSceneData) {
@@ -753,7 +753,7 @@ export default {
         if (this.optFrom === 'panel') {
           this.$emit('newViewInfo', { 'id': response.data.id })
         } else {
-          this.$emit('switchComponent', { name: 'ChartEdit', param: { 'id': response.data.id }})
+          this.$emit('switchComponent', { name: 'ChartEdit', param: response.data })
           // this.$store.dispatch('chart/setViewId', response.data.id)
           // this.chartTree()
           this.refreshNodeBy(view.sceneId)