From 1b83afc800928f21a46f8dc4c82252103624a250 Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Thu, 9 Feb 2023 20:18:46 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E8=A7=86=E5=9B=BE):=20=E4=BF=AE=E5=A4=8Ddo?=
 =?UTF-8?q?ris=E4=B8=AD=E4=BD=BF=E7=94=A8case=E8=AF=AD=E6=B3=95=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../engine/doris/DorisQueryProvider.java      | 25 +++++++++++++++----
 .../src/main/resources/sql/sqlTemplate.stg    | 14 +++++++++--
 2 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/backend/src/main/java/io/dataease/provider/engine/doris/DorisQueryProvider.java b/backend/src/main/java/io/dataease/provider/engine/doris/DorisQueryProvider.java
index 204a3f73f0..26e12c4b12 100644
--- a/backend/src/main/java/io/dataease/provider/engine/doris/DorisQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/engine/doris/DorisQueryProvider.java
@@ -155,7 +155,10 @@ public class DorisQueryProvider extends QueryProvider {
         STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
         ST st_sql = stg.getInstanceOf("previewSql");
         st_sql.add("isGroup", isGroup);
-        if (CollectionUtils.isNotEmpty(xFields)) st_sql.add("groups", xFields);
+        if (CollectionUtils.isNotEmpty(xFields)) {
+            st_sql.add("useAliasForGroup", true);
+            st_sql.add("groups", xFields);
+        }
         if (ObjectUtils.isNotEmpty(tableObj)) st_sql.add("table", tableObj);
         String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
         // row permissions tree
@@ -345,7 +348,10 @@ public class DorisQueryProvider extends QueryProvider {
 
         STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
         ST st_sql = stg.getInstanceOf("querySql");
-        if (CollectionUtils.isNotEmpty(xFields)) st_sql.add("groups", xFields);
+        if (CollectionUtils.isNotEmpty(xFields)) {
+            st_sql.add("useAliasForGroup", true);
+            st_sql.add("groups", xFields);
+        }
         if (CollectionUtils.isNotEmpty(yFields)) st_sql.add("aggregators", yFields);
         if (CollectionUtils.isNotEmpty(wheres)) st_sql.add("filters", wheres);
         if (ObjectUtils.isNotEmpty(tableObj)) st_sql.add("table", tableObj);
@@ -435,7 +441,10 @@ public class DorisQueryProvider extends QueryProvider {
         STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
         ST st_sql = stg.getInstanceOf("previewSql");
         st_sql.add("isGroup", false);
-        if (CollectionUtils.isNotEmpty(xFields)) st_sql.add("groups", xFields);
+        if (CollectionUtils.isNotEmpty(xFields)) {
+            st_sql.add("useAliasForGroup", true);
+            st_sql.add("groups", xFields);
+        }
         if (CollectionUtils.isNotEmpty(wheres)) st_sql.add("filters", wheres);
         if (ObjectUtils.isNotEmpty(tableObj)) st_sql.add("table", tableObj);
         String sql = st_sql.render();
@@ -558,7 +567,10 @@ public class DorisQueryProvider extends QueryProvider {
 
         STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
         ST st_sql = stg.getInstanceOf("querySql");
-        if (CollectionUtils.isNotEmpty(xFields)) st_sql.add("groups", xFields);
+        if (CollectionUtils.isNotEmpty(xFields)) {
+            st_sql.add("useAliasForGroup", true);
+            st_sql.add("groups", xFields);
+        }
         if (CollectionUtils.isNotEmpty(yFields)) st_sql.add("aggregators", yFields);
         if (CollectionUtils.isNotEmpty(wheres)) st_sql.add("filters", wheres);
         if (ObjectUtils.isNotEmpty(tableObj)) st_sql.add("table", tableObj);
@@ -672,7 +684,10 @@ public class DorisQueryProvider extends QueryProvider {
 
         STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
         ST st_sql = stg.getInstanceOf("querySql");
-        if (CollectionUtils.isNotEmpty(xFields)) st_sql.add("groups", xFields);
+        if (CollectionUtils.isNotEmpty(xFields)) {
+            st_sql.add("useAliasForGroup", true);
+            st_sql.add("groups", xFields);
+        }
         if (CollectionUtils.isNotEmpty(yFields)) st_sql.add("aggregators", yFields);
         if (CollectionUtils.isNotEmpty(wheres)) st_sql.add("filters", wheres);
         if (ObjectUtils.isNotEmpty(tableObj)) st_sql.add("table", tableObj);
diff --git a/backend/src/main/resources/sql/sqlTemplate.stg b/backend/src/main/resources/sql/sqlTemplate.stg
index 41cd934e64..9a0485cd51 100644
--- a/backend/src/main/resources/sql/sqlTemplate.stg
+++ b/backend/src/main/resources/sql/sqlTemplate.stg
@@ -1,4 +1,4 @@
-querySql(limitFiled, groups, aggregators, filters, orders, table, notUseAs)
+querySql(limitFiled, groups, aggregators, filters, orders, table, notUseAs, useAliasForGroup)
 ::=<<
 SELECT
 <if(limitFiled)>
@@ -25,8 +25,13 @@ WHERE
 <endif>
 <if(groups)>
 GROUP BY
+<if(!useAliasForGroup)>
     <groups:{group|<if(group)><group.fieldName><endif>}; separator=",\n">
 <endif>
+<if(useAliasForGroup)>
+    <groups:{group|<if(group)><group.fieldAlias><endif>}; separator=",\n">
+<endif>
+<endif>
 <if(orders)>
 ORDER BY
     <orders:{order|<if(order)><order.orderAlias> <order.orderDirection><endif>}; separator=",\n">
@@ -34,7 +39,7 @@ ORDER BY
 >>
 
 
-previewSql(limitFiled, groups, aggregators, filters, orders, table, isGroup, notUseAs)
+previewSql(limitFiled, groups, aggregators, filters, orders, table, isGroup, notUseAs, useAliasForGroup)
 ::=<<
 SELECT
 <if(limitFiled)>
@@ -61,8 +66,13 @@ WHERE
 <endif>
 <if(isGroup && groups)>
 GROUP BY
+<if(!useAliasForGroup)>
     <groups:{group|<if(group)><group.fieldName><endif>}; separator=",\n">
 <endif>
+<if(useAliasForGroup)>
+    <groups:{group|<if(group)><group.fieldAlias><endif>}; separator=",\n">
+<endif>
+<endif>
 <if(orders)>
 ORDER BY
     <orders:{order|<if(order)><order.orderAlias> <order.orderDirection><endif>}; separator=",\n">