‘linchangsheng’ 4 달 전
부모
커밋
bf195ee0a8
1개의 변경된 파일5개의 추가작업 그리고 3개의 파일을 삭제
  1. 5 3
      mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/OrderBaseEsLogic.java

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

@@ -78,9 +78,11 @@ public class OrderBaseEsLogic {
         this.montage(queryBuilder1,zfireParamBean);
 
         if (CollectionUtils.isNotEmpty(adminUser.getAdminWebsitIds())) {
-            List<QueryBuilder> should = queryBuilder1.should();
-            should.add(QueryBuilders.termsQuery("create_websit_id", adminUser.getAdminWebsitIds()));
-            should.add(QueryBuilders.termsQuery("websit_id", adminUser.getAdminWebsitIds()));
+            queryBuilder1.must(
+                    QueryBuilders.boolQuery().should(QueryBuilders.termsQuery("create_websit_id", adminUser.getAdminWebsitIds()))
+                    .should(QueryBuilders.termsQuery("websit_id", adminUser.getAdminWebsitIds()))
+                    );
+
         }
 
         List<String> orderBaseId = new ArrayList<>();