提交 c67d213b authored 作者: taojinlong's avatar taojinlong

fix: mongo 过滤

上级 c3d78993
...@@ -116,7 +116,7 @@ public class MongoQueryProvider extends QueryProvider { ...@@ -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 { ...@@ -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 { ...@@ -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 { ...@@ -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 { ...@@ -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 { ...@@ -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);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论