public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-06-15 02:21:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #386 from dataease/pr@v1.1@fix_视图兼容过滤

Browse Source 
fix: 视图兼容过滤
This commit is contained in:
XiaJunjie2020
2021-07-28 17:07:28 +08:00
committed by GitHub
parent 23b30a59fd f483abc943
commit b7cccef664
4 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java
View File

@@ -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()

2
backend/src/main/java/io/dataease/provider/mysql/MysqlQueryProvider.java
View File

@@ -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()

2
backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java
View File

@@ -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()

1
backend/src/main/resources/db/migration/V16__update_chart_filter.sql Normal file
View File

@@ -0,0 +1 @@
UPDATE `chart_view` SET `custom_filter` = '[]';