需求

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/OrderBaseEsLogic.java

@@ -74,18 +74,15 @@ public class OrderBaseEsLogic {
 
         AdminUserCom adminUser = commonLogic.getAdminUser();
 
-        BoolQueryBuilder queryBuilder = QueryBuilders.boolQuery();
-
+        BoolQueryBuilder queryBuilder1 = QueryBuilders.boolQuery();
+        this.montage(queryBuilder1,zfireParamBean);
 
         if (CollectionUtils.isNotEmpty(adminUser.getAdminWebsitIds())) {
-            List<QueryBuilder> should = queryBuilder.should();
+            List<QueryBuilder> should = queryBuilder1.should();
             should.add(QueryBuilders.termsQuery("create_websit_id", adminUser.getAdminWebsitIds()));
             should.add(QueryBuilders.termsQuery("websit_id", adminUser.getAdminWebsitIds()));
         }
 
-        BoolQueryBuilder queryBuilder1 = QueryBuilders.boolQuery();
-        this.montage(queryBuilder1,zfireParamBean);
-
         List<String> orderBaseId = new ArrayList<>();
 
         if (zfireParamBean.getIsWait() != null && zfireParamBean.getIsWait()){
@@ -109,7 +106,6 @@ public class OrderBaseEsLogic {
 
 
         NativeSearchQuery build = new NativeSearchQueryBuilder()
-                .withQuery(queryBuilder)
                 .withQuery(queryBuilder1)
                 .withSort(SortBuilders.fieldSort("create_time").order(SortOrder.DESC))
                 .withPageable(PageRequest.of(zfireParamBean.getPageNum() -1, zfireParamBean.getPageSize()))