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

fix: mongo 过滤

Browse Source
This commit is contained in:
taojinlong 2022-01-25 17:36:50 +08:00
parent c3d789931a
commit c67d213b29
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
backend/src/main/java/io/dataease/provider/query/mongodb/MongoQueryProvider.java
View File

@ -116,7 +116,7 @@ public class MongoQueryProvider extends QueryProvider {
st_sql.add("isGroup", isGroup); st_sql.add("isGroup", isGroup);
if (CollectionUtils.isNotEmpty(xFields)) { if (CollectionUtils.isNotEmpty(xFields)) {
st_sql.add("groups", xFields); st_sql.add("groups", xFields);
st_sql.add("notUseAs", true); // st_sql.add("notUseAs", true);
} }
if (ObjectUtils.isNotEmpty(tableObj)) st_sql.add("table", tableObj); if (ObjectUtils.isNotEmpty(tableObj)) st_sql.add("table", tableObj);
String customWheres = transCustomFilterList(tableObj, fieldCustomFilter); String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
@ -238,11 +238,11 @@ public class MongoQueryProvider extends QueryProvider {
ST st_sql = stg.getInstanceOf("querySql"); ST st_sql = stg.getInstanceOf("querySql");
if (CollectionUtils.isNotEmpty(xFields)) { if (CollectionUtils.isNotEmpty(xFields)) {
st_sql.add("groups", xFields); st_sql.add("groups", xFields);
st_sql.add("notUseAs", true); // st_sql.add("notUseAs", true);
} }
if (CollectionUtils.isNotEmpty(yFields)) { if (CollectionUtils.isNotEmpty(yFields)) {
st_sql.add("aggregators", yFields); st_sql.add("aggregators", yFields);
st_sql.add("notUseAs", true); // st_sql.add("notUseAs", true);
} }
if (CollectionUtils.isNotEmpty(wheres)) st_sql.add("filters", wheres); if (CollectionUtils.isNotEmpty(wheres)) st_sql.add("filters", wheres);
if (ObjectUtils.isNotEmpty(tableObj)) st_sql.add("table", tableObj); if (ObjectUtils.isNotEmpty(tableObj)) st_sql.add("table", tableObj);
@ -313,7 +313,7 @@ public class MongoQueryProvider extends QueryProvider {
st_sql.add("isGroup", false); st_sql.add("isGroup", false);
if (CollectionUtils.isNotEmpty(xFields)) { if (CollectionUtils.isNotEmpty(xFields)) {
st_sql.add("groups", xFields); st_sql.add("groups", xFields);
st_sql.add("notUseAs", true); // st_sql.add("notUseAs", true);
} }
if (CollectionUtils.isNotEmpty(wheres)) st_sql.add("filters", wheres); if (CollectionUtils.isNotEmpty(wheres)) st_sql.add("filters", wheres);
if (ObjectUtils.isNotEmpty(tableObj)) st_sql.add("table", tableObj); if (ObjectUtils.isNotEmpty(tableObj)) st_sql.add("table", tableObj);
@ -431,11 +431,11 @@ public class MongoQueryProvider extends QueryProvider {
ST st_sql = stg.getInstanceOf("querySql"); ST st_sql = stg.getInstanceOf("querySql");
if (CollectionUtils.isNotEmpty(xFields)) { if (CollectionUtils.isNotEmpty(xFields)) {
st_sql.add("groups", xFields); st_sql.add("groups", xFields);
st_sql.add("notUseAs", true); // st_sql.add("notUseAs", true);
} }
if (CollectionUtils.isNotEmpty(yFields)) { if (CollectionUtils.isNotEmpty(yFields)) {
st_sql.add("aggregators", yFields); st_sql.add("aggregators", yFields);
st_sql.add("notUseAs", true); // st_sql.add("notUseAs", true);
} }
if (CollectionUtils.isNotEmpty(wheres)) st_sql.add("filters", wheres); if (CollectionUtils.isNotEmpty(wheres)) st_sql.add("filters", wheres);
if (ObjectUtils.isNotEmpty(tableObj)) st_sql.add("table", tableObj); if (ObjectUtils.isNotEmpty(tableObj)) st_sql.add("table", tableObj);
@ -547,11 +547,11 @@ public class MongoQueryProvider extends QueryProvider {
ST st_sql = stg.getInstanceOf("querySql"); ST st_sql = stg.getInstanceOf("querySql");
if (CollectionUtils.isNotEmpty(xFields)) { if (CollectionUtils.isNotEmpty(xFields)) {
st_sql.add("groups", xFields); st_sql.add("groups", xFields);
st_sql.add("notUseAs", true); // st_sql.add("notUseAs", true);
} }
if (CollectionUtils.isNotEmpty(yFields)) { if (CollectionUtils.isNotEmpty(yFields)) {
st_sql.add("aggregators", yFields); st_sql.add("aggregators", yFields);
st_sql.add("notUseAs", true); // st_sql.add("notUseAs", true);
} }
if (CollectionUtils.isNotEmpty(wheres)) st_sql.add("filters", wheres); if (CollectionUtils.isNotEmpty(wheres)) st_sql.add("filters", wheres);
if (ObjectUtils.isNotEmpty(tableObj)) st_sql.add("table", tableObj); if (ObjectUtils.isNotEmpty(tableObj)) st_sql.add("table", tableObj);
@ -636,7 +636,7 @@ public class MongoQueryProvider extends QueryProvider {
ST st_sql = stg.getInstanceOf("querySql"); ST st_sql = stg.getInstanceOf("querySql");
if (CollectionUtils.isNotEmpty(yFields)) { if (CollectionUtils.isNotEmpty(yFields)) {
st_sql.add("aggregators", yFields); st_sql.add("aggregators", yFields);
st_sql.add("notUseAs", true); // st_sql.add("notUseAs", true);
} }
if (CollectionUtils.isNotEmpty(wheres)) st_sql.add("filters", wheres); if (CollectionUtils.isNotEmpty(wheres)) st_sql.add("filters", wheres);
if (ObjectUtils.isNotEmpty(tableObj)) st_sql.add("table", tableObj); if (ObjectUtils.isNotEmpty(tableObj)) st_sql.add("table", tableObj);