From acccac4d6e2d67ce5c17cbdae9ea43bfb8bf16c1 Mon Sep 17 00:00:00 2001 From: xiaozhequ <792962424@qq.com> Date: Thu, 19 Oct 2023 16:05:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=A4=E6=96=AD=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elasticsearc/CourseElasticsearchImpl.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/modules/boe-module-es/src/main/java/com/xboe/module/elasticsearc/CourseElasticsearchImpl.java b/modules/boe-module-es/src/main/java/com/xboe/module/elasticsearc/CourseElasticsearchImpl.java index 91e08fe5..473e6951 100644 --- a/modules/boe-module-es/src/main/java/com/xboe/module/elasticsearc/CourseElasticsearchImpl.java +++ b/modules/boe-module-es/src/main/java/com/xboe/module/elasticsearc/CourseElasticsearchImpl.java @@ -369,17 +369,22 @@ public class CourseElasticsearchImpl implements ICourseFullTextSearch{ //has.must(QueryBuilders.termsQuery("audience", ids)); has.must(QueryBuilders.termsQuery("audiences", params.getAudiences())); //查询出例外人员创建的课程 - BoolQueryBuilder exception =QueryBuilders.boolQuery(); - exception.must(QueryBuilders.termQuery("sysCreateAid",params.getSysCreateAids())); - audience.should(exception); + if(params.getSysCreateAids()!=null && params.getSysCreateAids().length>0) { + BoolQueryBuilder exception =QueryBuilders.boolQuery(); + exception.must(QueryBuilders.termQuery("sysCreateAid",params.getSysCreateAids())); + audience.should(exception); + } audience.should(has); audience.minimumShouldMatch(1); - boolQuery.filter(audience); //log.error("audience="+audience.toString()); }else { //如果当前用户无受众，只能查询未设置受众的课程 - boolQuery.must(QueryBuilders.termQuery("isSetAudience",0)); + boolQuery.should(QueryBuilders.termQuery("isSetAudience",0)); + if(params.getSysCreateAids()!=null && params.getSysCreateAids().length>0) { + boolQuery.should(QueryBuilders.termQuery("sysCreateAid",params.getSysCreateAids())); + + } } }