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

backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java

@@ -189,7 +189,7 @@ public class DorisQueryProvider extends QueryProvider {
                         } 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 class DorisQueryProvider extends QueryProvider {
                         } 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 class DorisQueryProvider extends QueryProvider {
         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 class DorisQueryProvider extends QueryProvider {
         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;
         }
     }

frontend/src/views/dataset/add/AddSQL.vue

@@ -220,7 +220,7 @@ export default {
         dataSourceId: this.dataSource,
         type: 'sql',
         // info: '{"sql":"' + this.sql + '"}',
-        info: JSON.stringify({ sql: this.sql })
+        info: JSON.stringify({ sql: this.sql.trim() })
       }).then(response => {
         this.fields = response.data.fields
         this.data = response.data.data
@@ -262,7 +262,7 @@ export default {
         type: 'sql',
         mode: parseInt(this.mode),
         // info: '{"sql":"' + this.sql + '"}',
-        info: JSON.stringify({ sql: this.sql })
+        info: JSON.stringify({ sql: this.sql.trim() })
       }
       post('/dataset/table/update', table).then(response => {
         // this.$store.dispatch('dataset/setSceneData', new Date().getTime())