|
@@ -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<>();
|