‘linchangsheng’ před 2 měsíci
rodič
revize
ff817db6fd

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

@@ -322,9 +322,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))