From ad25f77fe64f01e5c01f3f8b4c032f047e8ace0f Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Thu, 1 Feb 2024 12:21:59 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E6=BA=90):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A9=B1=E5=8A=A8=E7=AE=A1=E7=90=86=E4=B8=AD?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E7=89=88=E6=9C=AC=E5=8F=8D=E6=98=BE=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=20#7640?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/datasource/DriverMgmController.java        | 7 +++++++
 .../io/dataease/service/datasource/DriverService.java     | 3 +++
 core/frontend/src/api/system/datasource.js                | 8 ++++++++
 .../src/views/system/datasource/DriverFormDetail.vue      | 6 +++++-
 4 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/core/backend/src/main/java/io/dataease/controller/datasource/DriverMgmController.java b/core/backend/src/main/java/io/dataease/controller/datasource/DriverMgmController.java
index deac73e95a..4ab71a7fb8 100644
--- a/core/backend/src/main/java/io/dataease/controller/datasource/DriverMgmController.java
+++ b/core/backend/src/main/java/io/dataease/controller/datasource/DriverMgmController.java
@@ -98,6 +98,13 @@ public class DriverMgmController {
         return driverService.save(deDriver);
     }
 
+    @RequiresPermissions("datasource:read")
+    @ApiOperation("获取驱动")
+    @GetMapping("/getDriver/{id}")
+    public DeDriver getDriver(@PathVariable String id) throws Exception {
+        return driverService.get(id);
+    }
+
     @RequiresPermissions("datasource:read")
     @ApiOperation("更新驱动")
     @PostMapping("/update")
diff --git a/core/backend/src/main/java/io/dataease/service/datasource/DriverService.java b/core/backend/src/main/java/io/dataease/service/datasource/DriverService.java
index 0c71929d91..f9aad2e882 100644
--- a/core/backend/src/main/java/io/dataease/service/datasource/DriverService.java
+++ b/core/backend/src/main/java/io/dataease/service/datasource/DriverService.java
@@ -94,6 +94,9 @@ public class DriverService {
         return deDriver;
     }
 
+    public DeDriver get(String id) {
+        return deDriverMapper.selectByPrimaryKey(id);
+    }
 
     public List<DeDriverDetails> listDriverDetails(String driverId) {
         DeDriverDetailsExample example = new DeDriverDetailsExample();
diff --git a/core/frontend/src/api/system/datasource.js b/core/frontend/src/api/system/datasource.js
index 365d2b7da3..0aa70d6556 100644
--- a/core/frontend/src/api/system/datasource.js
+++ b/core/frontend/src/api/system/datasource.js
@@ -122,6 +122,14 @@ export function listDriverDetails(id) {
   })
 }
 
+export function getDriver(id) {
+  return request({
+    url: '/driver/getDriver/' + id,
+    method: 'get',
+    loading: true
+  })
+}
+
 export function deleteDriverFile(data) {
   return request({
     url: '/driver/deleteDriverFile',
diff --git a/core/frontend/src/views/system/datasource/DriverFormDetail.vue b/core/frontend/src/views/system/datasource/DriverFormDetail.vue
index 2ecb47d8af..4d314faeae 100644
--- a/core/frontend/src/views/system/datasource/DriverFormDetail.vue
+++ b/core/frontend/src/views/system/datasource/DriverFormDetail.vue
@@ -107,7 +107,7 @@
 <script>
 import i18n from '@/lang/index'
 import {
-  deleteDriverFile,
+  deleteDriverFile, getDriver,
   listDriverDetails,
   updateDriver
 } from '@/api/system/datasource'
@@ -216,6 +216,10 @@ export default {
       this.params.showModel === 'show' &&
       !this.canEdit
     this.listDriverDetails()
+
+    getDriver(this.driverForm.id).then((res) => {
+      this.driverForm = res.data
+    })
   },
   methods: {
     beforeUpload(file) {

From 97938782fad140c0ad5ca5f04f02d4ebfe820191 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Sun, 18 Feb 2024 10:57:10 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E9=9B=86):=20sql?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E5=AD=90=E6=9F=A5=E8=AF=A2=E4=B8=AD?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8union=E6=89=A7=E8=A1=8C=E5=BC=82=E5=B8=B8=20#?=
 =?UTF-8?q?8022?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/dataset/DataSetTableService.java  | 32 ++++++++++++-------
 1 file changed, 21 insertions(+), 11 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 4e66473900..2ce30795b5 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,21 +1116,31 @@ public class DataSetTableService {
     }
 
     private void handleFromItems(PlainSelect plainSelect, String dsType) throws Exception {
-
         FromItem fromItem = plainSelect.getFromItem();
         if (fromItem instanceof ParenthesedSelect) {
-            PlainSelect selectBody = ((ParenthesedSelect) fromItem).getPlainSelect();
-            Select subSelectTmp = (Select) CCJSqlParserUtil.parse(removeVariables(selectBody.toString(), dsType));
-            ((ParenthesedSelect) fromItem).setSelect(subSelectTmp.getSelectBody());
-            if (dsType.equals(DatasourceTypes.oracle.getType())) {
-                if (fromItem.getAlias() != null) {
+            if(((ParenthesedSelect) fromItem).getSelect() instanceof SetOperationList){
+                StringBuilder result = new StringBuilder();
+                SetOperationList setOperationList = (SetOperationList) ((ParenthesedSelect) fromItem).getSelect().getSelectBody();
+                for (int i = 0; i < setOperationList.getSelects().size(); i++) {
+                    result.append(handlePlainSelect((PlainSelect) setOperationList.getSelects().get(i), null, dsType));
+                    if (i < setOperationList.getSelects().size() - 1) {
+                        result.append(" ").append(setOperationList.getOperations().get(i).toString()).append(" ");
+                    }
+                }
+            }else {
+                PlainSelect selectBody = ((ParenthesedSelect) fromItem).getSelect().getPlainSelect();
+                Select subSelectTmp = (Select) CCJSqlParserUtil.parse(removeVariables(selectBody.toString(), dsType));
+                ((ParenthesedSelect) fromItem).setSelect(subSelectTmp.getSelectBody());
+                if (dsType.equals(DatasourceTypes.oracle.getType())) {
+                    if (fromItem.getAlias() != null) {
+                        fromItem.setAlias(new Alias(fromItem.getAlias().toString(), false));
+                    }
+                } else {
+                    if (fromItem.getAlias() == null) {
+                        throw new Exception("Failed to parse sql, Every derived table must have its own alias！");
+                    }
                     fromItem.setAlias(new Alias(fromItem.getAlias().toString(), false));
                 }
-            } else {
-                if (fromItem.getAlias() == null) {
-                    throw new Exception("Failed to parse sql, Every derived table must have its own alias！");
-                }
-                fromItem.setAlias(new Alias(fromItem.getAlias().toString(), false));
             }
             plainSelect.setFromItem(fromItem);
         }