fix: 自定义sql中出现count(*)等函数导致数据查询异常bug修复；doris查询排序过滤冲突sql修复

dataease · Jun 30, 2021 · 1248188 · 1248188
1 parent 3d2d187
commit 1248188
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 56 deletions.
diff --git a/backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java b/backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java
@@ -189,7 +189,7 @@ public String getSQL(String table, List<ChartViewFieldDTO> xAxis, List<ChartView
                         } else if (StringUtils.containsIgnoreCase(f.getTerm(), "like")) {
                             filter.append("%").append(f.getValue()).append("%");
                         } else {
-                            filter.append("'" + f.getValue() + "'");
+                            filter.append("'").append(f.getValue()).append("'");
                         }
                         return filter.toString();
                     }).toArray(String[]::new);
@@ -225,7 +225,7 @@ public String getSQL(String table, List<ChartViewFieldDTO> xAxis, List<ChartView
                         } else if (StringUtils.containsIgnoreCase(f.getTerm(), "like")) {
                             filter.append("%").append(f.getValue()).append("%");
                         } else {
-                            filter.append("'" + f.getValue() + "'");
+                            filter.append("'").append(f.getValue()).append("'");
                         }
                         return filter.toString();
                     }).toArray(String[]::new);
@@ -234,9 +234,10 @@ public String getSQL(String table, List<ChartViewFieldDTO> xAxis, List<ChartView
         if (resultFilter.length == 0) {
             return sql;
         } else {
-            String filterSql = MessageFormat.format("SELECT * FROM {0} WHERE 1=1 {1}",
+            String filterSql = MessageFormat.format("SELECT * FROM {0} WHERE 1=1 {1} ORDER BY {2}",
                     "(" + sql + ") AS tmp",
-                    StringUtils.join(resultFilter, " "));
+                    StringUtils.join(resultFilter, " "),
+                    StringUtils.join(yOrder, ","));
             return filterSql;
         }
     }
@@ -314,9 +315,10 @@ public String getSQLSummary(String table, List<ChartViewFieldDTO> yAxis, List<Ch
         if (resultFilter.length == 0) {
             return sql;
         } else {
-            String filterSql = MessageFormat.format("SELECT * FROM {0} WHERE 1=1 {1}",
+            String filterSql = MessageFormat.format("SELECT * FROM {0} WHERE 1=1 {1} ORDER BY {2}",
                     "(" + sql + ") AS tmp",
-                    StringUtils.join(resultFilter, " "));
+                    StringUtils.join(resultFilter, " "),
+                    StringUtils.join(order, ","));
             return filterSql;
         }
     }