From 693f83ad6d2565c0da47d9b9ae0581304d210c9f Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Mon, 27 Nov 2023 12:30:27 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8E=BB=E6=8E=89=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=BA=93=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/dataset/DataSetTableService.java        | 13 +++++++++++++
 .../plugins/datasource/dm/provider/DmConfig.java    |  5 ++---
 .../dm/dm-frontend/src/views/dm.vue                 |  4 ----
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
index d5561c0148..3b6b890970 100644
--- a/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
+++ b/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
@@ -1116,6 +1116,19 @@ public class DataSetTableService {
     }
 
     private String handlePlainSelect(PlainSelect plainSelect, Select statementSelect, String dsType) throws Exception {
+
+        List<SelectItem> selectItems = new ArrayList<>();
+        plainSelect.getSelectItems().forEach(selectItem -> {
+            System.out.println(selectItem);
+            System.out.println(selectItem instanceof PlainSelect);
+            System.out.println(selectItem instanceof SubSelect);
+
+            selectItems.add(selectItem);
+        });
+
+        plainSelect.addSelectItems(selectItems);
+
+
         FromItem fromItem = plainSelect.getFromItem();
         if (fromItem instanceof SubSelect) {
             SelectBody selectBody = ((SubSelect) fromItem).getSelectBody();
diff --git a/extensions/dataease-extensions-datasource/dm/dm-backend/src/main/java/io/dataease/plugins/datasource/dm/provider/DmConfig.java b/extensions/dataease-extensions-datasource/dm/dm-backend/src/main/java/io/dataease/plugins/datasource/dm/provider/DmConfig.java
index e1d07a3167..16f7eb1200 100644
--- a/extensions/dataease-extensions-datasource/dm/dm-backend/src/main/java/io/dataease/plugins/datasource/dm/provider/DmConfig.java
+++ b/extensions/dataease-extensions-datasource/dm/dm-backend/src/main/java/io/dataease/plugins/datasource/dm/provider/DmConfig.java
@@ -13,9 +13,8 @@ public class DmConfig extends JdbcConfiguration {
 
 
     public String getJdbc() {
-        return "jdbc:dm://HOST:PORT/DATABASE"
+        return "jdbc:dm://HOST:PORT"
                 .replace("HOST", getHost().trim())
-                .replace("PORT", getPort().toString())
-                .replace("DATABASE", getDataBase().trim());
+                .replace("PORT", getPort().toString());
     }
 }
diff --git a/extensions/dataease-extensions-datasource/dm/dm-frontend/src/views/dm.vue b/extensions/dataease-extensions-datasource/dm/dm-frontend/src/views/dm.vue
index 35dc3badef..d8ef255152 100644
--- a/extensions/dataease-extensions-datasource/dm/dm-frontend/src/views/dm.vue
+++ b/extensions/dataease-extensions-datasource/dm/dm-frontend/src/views/dm.vue
@@ -20,10 +20,6 @@
             <el-input :placeholder="$t('enter_the_port')" v-model="form.configuration.port" autocomplete="off"/>
           </el-form-item>
 
-          <el-form-item :label="$t('dataBase')" prop="configuration.dataBase">
-            <el-input v-model="form.configuration.dataBase" autocomplete="off"/>
-          </el-form-item>
-
           <el-form-item :label="$t('username')" prop="configuration.username">
             <el-input :placeholder="$t('one_user_name')" v-model="form.configuration.username" autocomplete="off"/>
           </el-form-item>