From f483abc943204079c2a49a1b9caf0d2de811580a Mon Sep 17 00:00:00 2001 From: junjie Date: Wed, 28 Jul 2021 17:05:33 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=86=E5=9B=BE=E5=85=BC=E5=AE=B9?= =?UTF-8?q?=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/provider/doris/DorisQueryProvider.java | 2 +- .../java/io/dataease/provider/mysql/MysqlQueryProvider.java | 2 +- .../java/io/dataease/provider/oracle/OracleQueryProvider.java | 2 +- .../main/resources/db/migration/V16__update_chart_filter.sql | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 backend/src/main/resources/db/migration/V16__update_chart_filter.sql diff --git a/backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java b/backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java index 6d93e4d8b3..f01135a926 100644 --- a/backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java @@ -185,7 +185,7 @@ public class DorisQueryProvider extends QueryProvider { // 处理横轴字段 xFields.add(getXFields(x, originField, fieldAlias)); // 处理横轴过滤 - xWheres.addAll(getXWheres(x, originField, fieldAlias)); +// xWheres.addAll(getXWheres(x, originField, fieldAlias)); // 处理横轴排序 if (StringUtils.isNotEmpty(x.getSort()) && !StringUtils.equalsIgnoreCase(x.getSort(), "none")) { xOrders.add(SQLObj.builder() diff --git a/backend/src/main/java/io/dataease/provider/mysql/MysqlQueryProvider.java b/backend/src/main/java/io/dataease/provider/mysql/MysqlQueryProvider.java index 7a3e858797..c987623e1d 100644 --- a/backend/src/main/java/io/dataease/provider/mysql/MysqlQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/mysql/MysqlQueryProvider.java @@ -175,7 +175,7 @@ public class MysqlQueryProvider extends QueryProvider { // 处理横轴字段 xFields.add(getXFields(x, originField, fieldAlias)); // 处理横轴过滤 - xWheres.addAll(getXWheres(x, originField, fieldAlias)); +// xWheres.addAll(getXWheres(x, originField, fieldAlias)); // 处理横轴排序 if (StringUtils.isNotEmpty(x.getSort()) && !StringUtils.equalsIgnoreCase(x.getSort(), "none")) { xOrders.add(SQLObj.builder() diff --git a/backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java b/backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java index 1ea83f57a8..b24b3ba44a 100644 --- a/backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java @@ -209,7 +209,7 @@ public class OracleQueryProvider extends QueryProvider { // 处理横轴字段 xFields.add(getXFields(x, originField, fieldAlias)); // 处理横轴过滤 - xWheres.addAll(getXWheres(x, originField, fieldAlias)); +// xWheres.addAll(getXWheres(x, originField, fieldAlias)); // 处理横轴排序 if (StringUtils.isNotEmpty(x.getSort()) && !StringUtils.equalsIgnoreCase(x.getSort(), "none")) { xOrders.add(SQLObj.builder() diff --git a/backend/src/main/resources/db/migration/V16__update_chart_filter.sql b/backend/src/main/resources/db/migration/V16__update_chart_filter.sql new file mode 100644 index 0000000000..05600e6900 --- /dev/null +++ b/backend/src/main/resources/db/migration/V16__update_chart_filter.sql @@ -0,0 +1 @@ +UPDATE `chart_view` SET `custom_filter` = '[]'; \ No newline at end of file