From 1432107999dc80a0c4175668f663b45e23c464b0 Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Thu, 7 Nov 2024 10:42:37 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E6=BA=90):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E6=95=B0=E6=8D=AE=E6=BA=90schema=E6=98=AF=E5=85=B3?=
 =?UTF-8?q?=E9=94=AE=E5=AD=97=E6=8A=A5=E9=94=99=20#13189?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/dataset/manage/DatasetSQLManage.java     | 4 ++--
 .../src/main/java/io/dataease/dataset/utils/TableUtils.java   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetSQLManage.java b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetSQLManage.java
index 9a8f5358b9..520be1882a 100644
--- a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetSQLManage.java
+++ b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetSQLManage.java
@@ -209,8 +209,6 @@ public class DatasetSQLManage {
                 String tablePrefix = "";
                 String tableSuffix = "";
                 if (ObjectUtils.isNotEmpty(currentSQLObj.getTableSchema())) {
-                    ts = currentSQLObj.getTableSchema() + ".";
-
                     if (isCross) {
                         tablePrefix = "`";
                         tableSuffix = "`";
@@ -219,6 +217,8 @@ public class DatasetSQLManage {
                         tablePrefix = datasourceType.getPrefix();
                         tableSuffix = datasourceType.getSuffix();
                     }
+
+                    ts = tablePrefix + currentSQLObj.getTableSchema() + tableSuffix + ".";
                 }
                 // build join
                 join.append(" ").append(joinType).append(" ")
diff --git a/core/core-backend/src/main/java/io/dataease/dataset/utils/TableUtils.java b/core/core-backend/src/main/java/io/dataease/dataset/utils/TableUtils.java
index e1d6bd4001..7fec9dcb5e 100644
--- a/core/core-backend/src/main/java/io/dataease/dataset/utils/TableUtils.java
+++ b/core/core-backend/src/main/java/io/dataease/dataset/utils/TableUtils.java
@@ -44,7 +44,6 @@ public class TableUtils {
         String prefix = "";
         String suffix = "";
         if (StringUtils.isNotEmpty(sqlObj.getTableSchema())) {
-            schema = sqlObj.getTableSchema() + ".";
             if (isCross) {
                 prefix = "`";
                 suffix = "`";
@@ -52,6 +51,7 @@ public class TableUtils {
                 prefix = datasourceType.getPrefix();
                 suffix = datasourceType.getSuffix();
             }
+            schema = prefix + sqlObj.getTableSchema() + suffix + ".";
         }
         return schema + prefix + sqlObj.getTableName() + suffix + " " + sqlObj.getTableAlias();
     }