提交 324b56ae 作者: 925993793@qq.com

逻辑bug修改

上级 16b8f6af
...@@ -116,7 +116,7 @@ public class EsService { ...@@ -116,7 +116,7 @@ public class EsService {
} }
boolQuery.filter(rangeQueryBuilder); boolQuery.filter(rangeQueryBuilder);
} }
boolQuery.must(QueryBuilders.termQuery("origin.keyword","")); boolQuery.mustNot(QueryBuilders.termQuery("origin.keyword",""));
//未删除状态查询 //未删除状态查询
boolQuery.mustNot(QueryBuilders.matchQuery("deleteFlag", "1")); boolQuery.mustNot(QueryBuilders.matchQuery("deleteFlag", "1"));
List<SubjectDataVo> subjectDataVos = formatData(getEsResult(searchSourceBuilder, boolQuery, subjectId)); List<SubjectDataVo> subjectDataVos = formatData(getEsResult(searchSourceBuilder, boolQuery, subjectId));
......
...@@ -375,7 +375,7 @@ public class EsStatisticsServiceImpl implements EsStatisticsService { ...@@ -375,7 +375,7 @@ public class EsStatisticsServiceImpl implements EsStatisticsService {
boolQuery.filter(QueryBuilders.rangeQuery("publishDate").lte(EsDateUtil.esFieldDateFormat(endTime))); boolQuery.filter(QueryBuilders.rangeQuery("publishDate").lte(EsDateUtil.esFieldDateFormat(endTime)));
} }
if (originFlag) { if (originFlag) {
boolQuery.must(QueryBuilders.termQuery("origin.keyword", "")); boolQuery.mustNot(QueryBuilders.termQuery("origin.keyword", ""));
} }
//未删除状态查询 //未删除状态查询
boolQuery.mustNot(QueryBuilders.matchQuery("deleteFlag", "1")); boolQuery.mustNot(QueryBuilders.matchQuery("deleteFlag", "1"));
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论