center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

feat(仪表板): 过滤组件备选项支持传参过滤

Browse Source
This commit is contained in:
junjun 2024-05-16 14:41:28 +08:00
parent 89a17fe60b
commit 2724c3c172
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/core-backend/src/main/java/io/dataease/engine/sql/SQLProvider.java
View File

@ -45,9 +45,11 @@ public class SQLProvider {
if (ObjectUtils.isNotEmpty(xFields)) st_sql.add("groups", xFields);
if (ObjectUtils.isNotEmpty(tableObj)) st_sql.add("table", tableObj);
String customWheres = sqlMeta.getCustomWheres();
String extWheres = sqlMeta.getExtWheres();
String whereTrees = sqlMeta.getWhereTrees();
List<String> wheres = new ArrayList<>();
if (customWheres != null) wheres.add(customWheres);
if (extWheres != null) wheres.add(extWheres);
if (whereTrees != null) wheres.add(whereTrees);
if (ObjectUtils.isNotEmpty(wheres)) st_sql.add("filters", wheres);