From d0418edd8dc59a48779a98ba57f07ea3692cd90a Mon Sep 17 00:00:00 2001
From: wisonic-s <shaochuan.wu@fit2cloud.com>
Date: Thu, 29 Dec 2022 19:26:32 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E8=A1=80=E6=BA=90=E5=85=B3=E7=B3=BB):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AD=98=E5=9C=A8=E5=A4=9A=E4=B8=AA=20Excel?=
 =?UTF-8?q?=20=E6=95=B0=E6=8D=AE=E9=9B=86=E4=BE=9D=E8=B5=96=E6=97=B6?=
 =?UTF-8?q?=E7=9A=84=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/java/io/dataease/ext/ExtDataSetTableMapper.xml | 2 +-
 backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.xml   | 2 +-
 2 files changed, 2 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 205a1b42f2..bc18c27b76 100644
--- a/backend/src/main/java/io/dataease/ext/ExtDataSetTableMapper.xml
+++ b/backend/src/main/java/io/dataease/ext/ExtDataSetTableMapper.xml
@@ -159,7 +159,7 @@
 
     <select id="queryDatasetRelation" resultType="io.dataease.dto.RelationDTO" resultMap="io.dataease.ext.ExtDataSourceMapper.RelationResultMap">
         select
-            ds.id,
+            ifnull(ds.id,'') `id`,
             ds.name,
             ds_auth.auths,
             'link' `type`,
diff --git a/backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.xml b/backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.xml
index a75137acd1..2f99cbe477 100644
--- a/backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.xml
+++ b/backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.xml
@@ -228,7 +228,7 @@
 
     <select id="queryPanelRelation" resultType="io.dataease.dto.RelationDTO" resultMap="io.dataease.ext.ExtDataSourceMapper.RelationResultMap">
         select
-            ds.id,
+            ifnull(ds.id,'') `id`,
             ds.name,
             ds_auth.auths,
             'link' `type`,