From 9d056889b36c508d8608dd54d599a2a50033f396 Mon Sep 17 00:00:00 2001 From: xiaozhequ <792962424@qq.com> Date: Thu, 19 Oct 2023 14:55:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=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 | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 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 86b789a3..91e08fe5 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 @@ -361,22 +361,25 @@ public class CourseElasticsearchImpl implements ICourseFullTextSearch{ if(params.getAudiences()!=null && params.getAudiences().length>0) { //if(StringUtils.isNotBlank(params.getAudience())) { BoolQueryBuilder audience= QueryBuilders.boolQuery(); -// audience.should(QueryBuilders.termQuery("isSetAudience",0)); + audience.should(QueryBuilders.termQuery("isSetAudience",0)); BoolQueryBuilder has= QueryBuilders.boolQuery(); //String[] ids=params.getAudience().split(","); has.must(QueryBuilders.termQuery("isSetAudience",1)); //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); audience.should(has); - audience.minimumShouldMatch(1); boolQuery.filter(audience); //log.error("audience="+audience.toString()); }else { //如果当前用户无受众，只能查询未设置受众的课程 -// boolQuery.must(QueryBuilders.termQuery("isSetAudience",0)); + boolQuery.must(QueryBuilders.termQuery("isSetAudience",0)); } } @@ -611,12 +614,7 @@ public class CourseElasticsearchImpl implements ICourseFullTextSearch{ if(boolQuery.hasClauses()) { sourceBuilder.query(boolQuery); } -// 查出例外人员 - if(paras.getSysCreateAids()!=null&¶s.getSysCreateAids().length>0){ - BoolQueryBuilder builder= QueryBuilders.boolQuery(); - builder.should(QueryBuilders.termsQuery("sysCreateAid",paras.getSysCreateAids())); - sourceBuilder.query(builder); - } +