需求

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

@@ -111,9 +111,10 @@ public class OrderBaseCountLogic {
             BoolQueryBuilder queryBuilder = QueryBuilders.boolQuery();
 
             if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(adminUser.getAdminWebsitIds())) {
-                List<QueryBuilder> should = queryBuilder.should();
-                should.add(QueryBuilders.termsQuery("create_websit_id", adminUser.getAdminWebsitIds()));
-                should.add(QueryBuilders.termsQuery("websit_id", adminUser.getAdminWebsitIds()));
+                queryBuilder.must(
+                        QueryBuilders.boolQuery().should(QueryBuilders.termsQuery("create_websit_id", adminUser.getAdminWebsitIds()))
+                                .should(QueryBuilders.termsQuery("websit_id", adminUser.getAdminWebsitIds()))
+                );
             }
             //新增工单
             NativeSearchQuery searchQuery = new NativeSearchQueryBuilder()

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

@@ -333,9 +333,10 @@ public class OrderBaseEsLogic {
 
         List<Map<String, Object>> maps = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(adminUser.getAdminWebsitIds())) {
-            List<QueryBuilder> should = queryBuilder.should();
-            should.add(QueryBuilders.termsQuery("create_websit_id", adminUser.getAdminWebsitIds()));
-            should.add(QueryBuilders.termsQuery("websit_id", adminUser.getAdminWebsitIds()));
+            queryBuilder.must(
+                    QueryBuilders.boolQuery().should(QueryBuilders.termsQuery("create_websit_id", adminUser.getAdminWebsitIds()))
+                            .should(QueryBuilders.termsQuery("websit_id", adminUser.getAdminWebsitIds()))
+            );
         }
 
         if (!StringUtil.isEmpty(orderSmallTypeText))