From 2062cfd4e6fd3a9623b5c1d4e50ef5e7e4ef32f2 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Wed, 29 Nov 2023 12:59:43 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20SQL=E5=8F=98=E9=87=8F=E8=AF=AF=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=20#6624?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/dataset/DataSetTableService.java  | 72 +++++++++++++------
 1 file changed, 50 insertions(+), 22 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 057f561df7..8b9adb8d47 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
@@ -1115,7 +1115,22 @@ public class DataSetTableService {
         }
     }
 
-    private String handlePlainSelect(PlainSelect plainSelect, Select statementSelect, String dsType) throws Exception {
+    private void handleSelectItems(PlainSelect plainSelect, String dsType) throws Exception{
+        List<SelectItem> selectItems = new ArrayList<>();
+        for (SelectItem selectItem : plainSelect.getSelectItems()) {
+            SelectExpressionItem selectExpressionItem = (SelectExpressionItem) selectItem;
+            if (selectExpressionItem.getExpression() instanceof SubSelect) {
+                SubSelect subSelect = (SubSelect) selectExpressionItem.getExpression();
+                Select select = (Select) CCJSqlParserUtil.parse (removeVariables(subSelect.getSelectBody().toString(), dsType));
+                subSelect.setSelectBody(select.getSelectBody());
+                ((SelectExpressionItem) selectItem).setExpression(subSelect);
+            }
+            selectItems.add(selectItem);
+        }
+        plainSelect.setSelectItems(selectItems);
+    }
+
+    private void handleFromItems(PlainSelect plainSelect, String dsType) throws Exception{
         FromItem fromItem = plainSelect.getFromItem();
         if (fromItem instanceof SubSelect) {
             SelectBody selectBody = ((SubSelect) fromItem).getSelectBody();
@@ -1134,6 +1149,8 @@ public class DataSetTableService {
             }
             plainSelect.setFromItem(subSelect);
         }
+    }
+    private void handleJoins(PlainSelect plainSelect, String dsType) throws Exception{
         List<Join> joins = plainSelect.getJoins();
         if (joins != null) {
             List<Join> joinsList = new ArrayList<>();
@@ -1159,27 +1176,29 @@ public class DataSetTableService {
             }
             plainSelect.setJoins(joinsList);
         }
-        Expression expr = plainSelect.getWhere();
-        if (expr == null) {
-            return handleWith(plainSelect, statementSelect, dsType);
-        }
-        StringBuilder stringBuilder = new StringBuilder();
-        BinaryExpression binaryExpression = null;
-        try {
-            binaryExpression = (BinaryExpression) expr;
-        } catch (Exception e) {
-        }
-        if (binaryExpression != null) {
-            if (!(binaryExpression.getLeftExpression() instanceof BinaryExpression) && !(binaryExpression.getLeftExpression() instanceof InExpression) && hasVariable(binaryExpression.getRightExpression().toString())) {
-                stringBuilder.append(SubstitutedSql);
-            } else {
-                expr.accept(getExpressionDeParser(stringBuilder));
-            }
-        } else {
-            expr.accept(getExpressionDeParser(stringBuilder));
-        }
-        plainSelect.setWhere(CCJSqlParserUtil.parseCondExpression(stringBuilder.toString()));
-        return handleWith(plainSelect, statementSelect, dsType);
+    }
+   private String handleWhere(PlainSelect plainSelect, Select statementSelect, String dsType) throws Exception{
+       Expression expr = plainSelect.getWhere();
+       if (expr == null) {
+           return handleWith(plainSelect, statementSelect, dsType);
+       }
+       StringBuilder stringBuilder = new StringBuilder();
+       BinaryExpression binaryExpression = null;
+       try {
+           binaryExpression = (BinaryExpression) expr;
+       } catch (Exception e) {
+       }
+       if (binaryExpression != null) {
+           if (!(binaryExpression.getLeftExpression() instanceof BinaryExpression) && !(binaryExpression.getLeftExpression() instanceof InExpression) && hasVariable(binaryExpression.getRightExpression().toString())) {
+               stringBuilder.append(SubstitutedSql);
+           } else {
+               expr.accept(getExpressionDeParser(stringBuilder));
+           }
+       } else {
+           expr.accept(getExpressionDeParser(stringBuilder));
+       }
+       plainSelect.setWhere(CCJSqlParserUtil.parseCondExpression(stringBuilder.toString()));
+       return handleWith(plainSelect, statementSelect, dsType);
     }
 
     private String handleWith(PlainSelect plainSelect, Select select, String dsType) throws Exception {
@@ -1200,6 +1219,15 @@ public class DataSetTableService {
         return builder.toString();
     }
 
+    private String handlePlainSelect(PlainSelect plainSelect, Select statementSelect, String dsType) throws Exception {
+        handleSelectItems(plainSelect, dsType);
+        handleFromItems(plainSelect, dsType);
+        handleJoins(plainSelect, dsType);
+        return handleWhere(plainSelect, statementSelect, dsType);
+    }
+
+
+
     public Map<String, Object> getDBPreview(DataSetTableRequest dataSetTableRequest) throws Exception {
         Datasource ds = datasourceMapper.selectByPrimaryKey(dataSetTableRequest.getDataSourceId());
         if (ds == null) {