Merge branch 'xiaozhequ'

# Conflicts:
#	modules/boe-module-es/src/main/java/com/xboe/module/elasticsearc/CourseElasticsearchImpl.java
This commit is contained in:
xiaozhequ
2023-10-19 23:25:24 +08:00

View File

@@ -371,7 +371,7 @@ public class CourseElasticsearchImpl implements ICourseFullTextSearch{
//查询出例外人员创建的课程 //查询出例外人员创建的课程
if(params.getSysCreateAids()!=null && params.getSysCreateAids().length>0) { if(params.getSysCreateAids()!=null && params.getSysCreateAids().length>0) {
BoolQueryBuilder exception =QueryBuilders.boolQuery(); BoolQueryBuilder exception =QueryBuilders.boolQuery();
exception.must(QueryBuilders.termsQuery("sysCreateAid",params.getSysCreateAids())); exception.must(QueryBuilders.termQuery("sysCreateAid",params.getSysCreateAids()));
audience.should(exception); audience.should(exception);
} }
audience.should(has); audience.should(has);
@@ -384,8 +384,7 @@ public class CourseElasticsearchImpl implements ICourseFullTextSearch{
if(params.getSysCreateAids()!=null && params.getSysCreateAids().length>0) { if(params.getSysCreateAids()!=null && params.getSysCreateAids().length>0) {
boolQuery.should(QueryBuilders.termsQuery("sysCreateAid",params.getSysCreateAids())); boolQuery.should(QueryBuilders.termsQuery("sysCreateAid",params.getSysCreateAids()));
} }
boolQuery.minimumShouldMatch(1);
} }
} }