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 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 @@ - - - -