fix

src/main/java/com/zzsn/knowbase/service/impl/KnowledgeServiceImpl.java

@@ -310,7 +310,7 @@ class KnowledgeServiceImpl implements IKnowledgeService {
         searchSourceBuilder.from((pageNo - 1) * pageSize);
         //默认按照置顶以及时间倒序排列
         //根据topNum正序查找，查询置顶数据
-        searchSourceBuilder.sort("publishDate", SortOrder.DESC);
+//        searchSourceBuilder.sort("publishDate", SortOrder.DESC);
         if ("publishDate".equals(column)) {
             if ("desc".equals(order)) {
                 searchSourceBuilder.sort("publishDate", SortOrder.DESC);
@@ -384,7 +384,7 @@ class KnowledgeServiceImpl implements IKnowledgeService {
             boolQuery.must(multiMatchQueryBuilder);
         }
         if (StringUtils.isNotEmpty(knowledgeParam.getOrigin())) {
-            boolQuery.must(QueryBuilders.matchPhraseQuery("origin", knowledgeParam.getOrigin()));
+            boolQuery.must(QueryBuilders.matchQuery("origin", knowledgeParam.getOrigin()));
         }
         if (StringUtils.isNotEmpty(knowledgeParam.getVerifierName())) {
             boolQuery.must(QueryBuilders.matchPhraseQuery("verifierName", knowledgeParam.getVerifierName()));
@@ -415,6 +415,14 @@ class KnowledgeServiceImpl implements IKnowledgeService {
         if (StringUtils.isNotBlank(knowledgeParam.getEndTime())) {
             boolQuery.filter(QueryBuilders.rangeQuery("publishDate").lte(EsDateUtil.esFieldDateFormat(knowledgeParam.getEndTime())));
         }
+
+        //时间过滤筛选
+        if (StringUtils.isNotBlank(knowledgeParam.getVerifyStartTime())) {
+            boolQuery.filter(QueryBuilders.rangeQuery("verifyTime").gte(EsDateUtil.esFieldDateFormat(knowledgeParam.getStartTime())));
+        }
+        if (StringUtils.isNotBlank(knowledgeParam.getVerifyEndTime())) {
+            boolQuery.filter(QueryBuilders.rangeQuery("verifyTime").lte(EsDateUtil.esFieldDateFormat(knowledgeParam.getEndTime())));
+        }
         outer.should(boolQuery);
         searchSourceBuilder.query(outer);
         searchRequest.source(searchSourceBuilder);