From ceca6cc9d86133ba29664b50359e89f5c5b1f51e Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Thu, 29 Aug 2024 16:25:58 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF=E3=80=81?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=9B=BE=E8=A1=A8=E8=BF=87=E6=BB=A4=EF=BC=8C?=
 =?UTF-8?q?=E7=A6=81=E7=94=A8=E6=97=A0=E6=95=B0=E6=8D=AE=E9=9B=86=E5=9B=BE?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ExtVisualizationLinkJumpMapper.xml        | 32 +++++++++++++------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/core/core-backend/src/main/resources/mybatis/ExtVisualizationLinkJumpMapper.xml b/core/core-backend/src/main/resources/mybatis/ExtVisualizationLinkJumpMapper.xml
index 3d1ee7b7f7..2c313e85a5 100644
--- a/core/core-backend/src/main/resources/mybatis/ExtVisualizationLinkJumpMapper.xml
+++ b/core/core-backend/src/main/resources/mybatis/ExtVisualizationLinkJumpMapper.xml
@@ -117,16 +117,28 @@
     </select>
 
     <select id="getViewTableDetails" resultMap="ViewTableFieldDetailsMap">
-        SELECT core_chart_view.id,
-               core_chart_view.title,
-               core_chart_view.type,
-               core_chart_view.scene_id as dv_id, core_dataset_table_field.id AS field_id, core_dataset_table_field.origin_name,
-               core_dataset_table_field.`name` AS field_name, core_dataset_table_field.type AS field_type, core_dataset_table_field.de_type
-        FROM core_chart_view
-                 LEFT JOIN core_dataset_table_field
-                           ON core_chart_view.table_id = core_dataset_table_field.dataset_group_id
-        WHERE core_chart_view.scene_id = #{dvId}
-          and core_chart_view.type != 'VQuery'
+        SELECT
+        	core_chart_view.id,
+        	core_chart_view.title,
+        	core_chart_view.type,
+        	core_chart_view.scene_id AS dv_id,
+        	core_dataset_table_field.id AS field_id,
+        	core_dataset_table_field.origin_name,
+        	core_dataset_table_field.`name` AS field_name,
+        	core_dataset_table_field.type AS field_type,
+        	core_dataset_table_field.de_type
+        FROM
+        	core_chart_view
+        	LEFT JOIN core_dataset_table_field ON core_chart_view.table_id = core_dataset_table_field.dataset_group_id
+        	INNER JOIN data_visualization_info dvi ON core_chart_view.scene_id = dvi.id
+        WHERE
+        	core_chart_view.scene_id = #{dvId}
+        	AND core_chart_view.type != 'VQuery'
+        	AND core_chart_view.table_id IS NOT NULL
+        	AND dvi.id = #{dvId}
+        	AND LOCATE(
+        	core_chart_view.id,
+        	dvi.component_data)
     </select>
 
     <select id="queryWithViewId" resultMap="BaseResultMapDTO">