diff --git a/backend/src/main/java/io/dataease/provider/query/mongodb/MongoQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/mongodb/MongoQueryProvider.java index fd11d228a6..e2922121c0 100644 --- a/backend/src/main/java/io/dataease/provider/query/mongodb/MongoQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/query/mongodb/MongoQueryProvider.java @@ -116,7 +116,7 @@ public class MongoQueryProvider extends QueryProvider { st_sql.add("isGroup", isGroup); if (CollectionUtils.isNotEmpty(xFields)) { st_sql.add("groups", xFields); -// st_sql.add("notUseAs", true); + st_sql.add("notUseAs", true); } if (ObjectUtils.isNotEmpty(tableObj)) st_sql.add("table", tableObj); String customWheres = transCustomFilterList(tableObj, fieldCustomFilter); @@ -238,7 +238,7 @@ public class MongoQueryProvider extends QueryProvider { ST st_sql = stg.getInstanceOf("querySql"); if (CollectionUtils.isNotEmpty(xFields)) { st_sql.add("groups", xFields); -// st_sql.add("notUseAs", true); + st_sql.add("notUseAs", true); } if (CollectionUtils.isNotEmpty(yFields)) { st_sql.add("aggregators", yFields); @@ -313,7 +313,7 @@ public class MongoQueryProvider extends QueryProvider { st_sql.add("isGroup", false); if (CollectionUtils.isNotEmpty(xFields)) { st_sql.add("groups", xFields); -// st_sql.add("notUseAs", true); + st_sql.add("notUseAs", true); } if (CollectionUtils.isNotEmpty(wheres)) st_sql.add("filters", wheres); if (ObjectUtils.isNotEmpty(tableObj)) st_sql.add("table", tableObj); @@ -431,7 +431,7 @@ public class MongoQueryProvider extends QueryProvider { ST st_sql = stg.getInstanceOf("querySql"); if (CollectionUtils.isNotEmpty(xFields)) { st_sql.add("groups", xFields); -// st_sql.add("notUseAs", true); + st_sql.add("notUseAs", true); } if (CollectionUtils.isNotEmpty(yFields)) { st_sql.add("aggregators", yFields); @@ -547,7 +547,7 @@ public class MongoQueryProvider extends QueryProvider { ST st_sql = stg.getInstanceOf("querySql"); if (CollectionUtils.isNotEmpty(xFields)) { st_sql.add("groups", xFields); -// st_sql.add("notUseAs", true); + st_sql.add("notUseAs", true); } if (CollectionUtils.isNotEmpty(yFields)) { st_sql.add("aggregators", yFields); diff --git a/backend/src/main/resources/sql/sqlTemplate.stg b/backend/src/main/resources/sql/sqlTemplate.stg index e1a80c86ad..41cd934e64 100644 --- a/backend/src/main/resources/sql/sqlTemplate.stg +++ b/backend/src/main/resources/sql/sqlTemplate.stg @@ -14,10 +14,7 @@ SELECT AS }; separator=",\n"> , - - }; separator=",\n"> - - + AS }; separator=",\n"> FROM @@ -53,10 +50,7 @@ SELECT AS }; separator=",\n"> , - - }; separator=",\n"> - - + AS }; separator=",\n"> FROM