From e0dc17bf8808b119e36c5a276cf06d328008b879 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 2 Apr 2024 15:51:23 +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=E5=85=AC=E5=85=B1=E9=93=BE=E6=8E=A5=E5=86=85=E9=83=A8?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E4=B8=8D=E6=94=AF=E6=8C=81=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E6=9F=A5=E6=89=BE=E7=9B=AE=E6=A0=87=E4=BB=AA=E8=A1=A8=E6=9D=BF?=
 =?UTF-8?q?=E5=85=AC=E5=85=B1=E9=93=BE=E6=8E=A5=E9=97=AE=E9=A2=98=20#8695?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../server/VisualizationLinkJumpService.java  |  1 -
 .../ExtVisualizationLinkJumpMapper.xml        | 59 ++++++++++---------
 2 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/core/core-backend/src/main/java/io/dataease/visualization/server/VisualizationLinkJumpService.java b/core/core-backend/src/main/java/io/dataease/visualization/server/VisualizationLinkJumpService.java
index 251da1330c..48a85ddc47 100644
--- a/core/core-backend/src/main/java/io/dataease/visualization/server/VisualizationLinkJumpService.java
+++ b/core/core-backend/src/main/java/io/dataease/visualization/server/VisualizationLinkJumpService.java
@@ -71,7 +71,6 @@ public class VisualizationLinkJumpService implements VisualizationLinkJumpApi {
 
     //获取仪表板的跳转信息
     @Override
-    @XpackInteract(value = "visualizationLinkJumpService", original = true)
     public VisualizationLinkJumpBaseResponse queryVisualizationJumpInfo(Long dvId) {
         Map<String, VisualizationLinkJumpInfoDTO> resultBase = new HashMap<>();
         List<VisualizationLinkJumpDTO> resultLinkJumpList = extVisualizationLinkJumpMapper.queryWithDvId(dvId, AuthUtils.getUser().getUserId());
diff --git a/core/core-backend/src/main/resources/mybatis/ExtVisualizationLinkJumpMapper.xml b/core/core-backend/src/main/resources/mybatis/ExtVisualizationLinkJumpMapper.xml
index 26dc274590..75a18168f2 100644
--- a/core/core-backend/src/main/resources/mybatis/ExtVisualizationLinkJumpMapper.xml
+++ b/core/core-backend/src/main/resources/mybatis/ExtVisualizationLinkJumpMapper.xml
@@ -70,33 +70,38 @@
     </resultMap>
 
     <select id="getLinkJumpInfo" resultMap="LinkJumpInfoMap">
-        SELECT core_dataset_table_field.id AS source_field_id, core_dataset_table_field.de_type AS source_de_type, core_dataset_table_field.NAME AS source_field_name, visualization_link_jump_info.id,
-               visualization_link_jump_info.link_jump_id,
-               visualization_link_jump_info.link_type,
-               visualization_link_jump_info.jump_type,
-               visualization_link_jump_info.target_dv_id,
-               visualization_link_jump_info.content,
-               visualization_link_jump_info.target_dv_id             AS publicJumpId,
-               ifnull(visualization_link_jump_info.checked, 0)       AS checked,
-               ifnull(visualization_link_jump_info.attach_params, 0) AS attach_params,
-               visualization_link_jump_target_view_info.target_view_id,
-               visualization_link_jump_target_view_info.target_field_id,
-               visualization_link_jump_target_view_info.source_field_active_id
-        FROM core_chart_view
-                 LEFT JOIN core_dataset_table_field
-                           ON core_chart_view.table_id = core_dataset_table_field.dataset_group_id
-                 LEFT JOIN visualization_link_jump
-                           ON core_chart_view.id = visualization_link_jump.source_view_id and
-                              visualization_link_jump.id = #{id}
-                 LEFT JOIN visualization_link_jump_info
-                           ON visualization_link_jump.id = visualization_link_jump_info.link_jump_id
-                               AND core_dataset_table_field.id = visualization_link_jump_info.source_field_id
-                 LEFT JOIN visualization_link_jump_target_view_info
-                           ON visualization_link_jump_info.id =
-                              visualization_link_jump_target_view_info.link_jump_info_id
-        WHERE core_chart_view.id = #{source_view_id}
-          and core_chart_view.type != 'VQuery'
-        ORDER BY CONVERT (core_dataset_table_field.NAME using gbk)
+        SELECT
+            core_dataset_table_field.id AS source_field_id,
+            core_dataset_table_field.de_type AS source_de_type,
+            core_dataset_table_field.NAME AS source_field_name,
+            visualization_link_jump_info.id,
+            visualization_link_jump_info.link_jump_id,
+            visualization_link_jump_info.link_type,
+            visualization_link_jump_info.jump_type,
+            visualization_link_jump_info.target_dv_id,
+            visualization_link_jump_info.content,
+            xpack_share.uuid AS publicJumpId,
+            ifnull( visualization_link_jump_info.checked, 0 ) AS checked,
+            ifnull( visualization_link_jump_info.attach_params, 0 ) AS attach_params,
+            visualization_link_jump_target_view_info.target_view_id,
+            visualization_link_jump_target_view_info.target_field_id,
+            visualization_link_jump_target_view_info.source_field_active_id
+        FROM
+            core_chart_view
+                LEFT JOIN core_dataset_table_field ON core_chart_view.table_id = core_dataset_table_field.dataset_group_id
+                LEFT JOIN visualization_link_jump ON core_chart_view.id = visualization_link_jump.source_view_id
+                AND visualization_link_jump.id = #{id}
+                LEFT JOIN visualization_link_jump_info ON visualization_link_jump.id = visualization_link_jump_info.link_jump_id
+                AND core_dataset_table_field.id = visualization_link_jump_info.source_field_id
+                LEFT JOIN visualization_link_jump_target_view_info ON visualization_link_jump_info.id = visualization_link_jump_target_view_info.link_jump_info_id
+                LEFT JOIN xpack_share ON xpack_share.creator = #{uid}
+                AND visualization_link_jump_info.target_dv_id = xpack_share.resource_id
+        WHERE
+            core_chart_view.id = #{source_view_id}
+          AND core_chart_view.type != 'VQuery'
+        ORDER BY
+            CONVERT (
+            core_dataset_table_field.NAME USING gbk)
     </select>
 
     <select id="queryWithDvId" resultMap="BaseResultMapDTO">