From e262c93ae2667c656189e6ba573ba2c8a8fa1972 Mon Sep 17 00:00:00 2001
From: wisonic-s <shaochuan.wu@fit2cloud.com>
Date: Tue, 27 Dec 2022 12:17:55 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E8=A1=80=E6=BA=90=E5=88=86=E6=9E=90):=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=A1=80=E6=BA=90=E5=85=B3=E7=B3=BB=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E7=BB=93=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复 Excel 数据集的引用未正确显示，去除查询结果中重复的部分。
---
 .../src/main/java/io/dataease/ext/ExtDataSetTableMapper.xml  | 1 +
 .../src/main/java/io/dataease/ext/ExtDataSourceMapper.xml    | 1 +
 .../src/main/java/io/dataease/ext/ExtPanelGroupMapper.xml    | 5 +++--
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/dataease/ext/ExtDataSetTableMapper.xml b/backend/src/main/java/io/dataease/ext/ExtDataSetTableMapper.xml
index b51d1e3d16..46bbce05dd 100644
--- a/backend/src/main/java/io/dataease/ext/ExtDataSetTableMapper.xml
+++ b/backend/src/main/java/io/dataease/ext/ExtDataSetTableMapper.xml
@@ -234,6 +234,7 @@
             group by sa.auth_source
         ) pg_auth on pg_auth.id = pg.id
         where dt.id=#{datasetId,jdbcType=VARCHAR}
+        group by id,panel_id
         order by id
     </select>
 </mapper>
diff --git a/backend/src/main/java/io/dataease/ext/ExtDataSourceMapper.xml b/backend/src/main/java/io/dataease/ext/ExtDataSourceMapper.xml
index e20645682e..49c1bfe889 100644
--- a/backend/src/main/java/io/dataease/ext/ExtDataSourceMapper.xml
+++ b/backend/src/main/java/io/dataease/ext/ExtDataSourceMapper.xml
@@ -239,6 +239,7 @@
             group by sa.auth_source
         ) pg_auth on pg_auth.id = pg.id
         where ds.id=#{datasourceId,jdbcType=VARCHAR}
+        group by id,panel_id
         order by id
     </select>
 </mapper>
diff --git a/backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.xml b/backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.xml
index 4c6343e5e3..8aebceeb0c 100644
--- a/backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.xml
+++ b/backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.xml
@@ -285,7 +285,7 @@
             )
             group by sa.auth_source
         ) dt_auth on dt.id = dt_auth.id
-        join datasource ds on dt.data_source_id = ds.id
+        left join datasource ds on dt.data_source_id = ds.id
         left join
         (
             select
@@ -318,7 +318,8 @@
             group by sa.auth_source
         ) ds_auth on ds_auth.id = ds.id
         where pg.id=#{panelId,jdbcType=VARCHAR}
-        group by dt.id
+        group by id,dt_id
+        order by id
     </select>
 
     <select id="listPanelByUser" resultType="io.dataease.plugins.common.base.domain.PanelGroup"