10/18 添加工号配置 受众权限

This commit is contained in:
xiaozhequ
2023-10-18 11:39:28 +08:00
parent a4c67fc52e
commit 367b0d05ea
4 changed files with 35 additions and 10 deletions

View File

@@ -126,4 +126,19 @@ public class CourseFullText {
*/
private List<String> keywordsList;
/**
* 课程创建人id
*/
private String sysCreateAid;
/**
* 课程创建人id
*/
private String[] sysCreateAids;
/**
* 受众
*/
private String audience;
}

View File

@@ -354,31 +354,31 @@ public class CourseElasticsearchImpl implements ICourseFullTextSearch{
}
/* 2023-08-08 不管是否是此课程受众 ,都可以搜索到 但点进课程详情提示无权限
/* 2023-08-08 不管是否是此课程受众 ,都可以搜索到 但点进课程详情提示无权限*/
//加上Source判断是为了应对后台查询后台查询时不需要权限但是需要指定数据来源
if(params.getSource()==null || params.getSource()==0 ) {
//受众权限条件,必须是有受众的课程并且受众条件不为空
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()));
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));
}
}*/
}
//在哪端显示
if(params.getDevice()!=null) {
@@ -611,6 +611,11 @@ public class CourseElasticsearchImpl implements ICourseFullTextSearch{
if(boolQuery.hasClauses()) {
sourceBuilder.query(boolQuery);
}
// 查出例外人员
BoolQueryBuilder builder= QueryBuilders.boolQuery();
builder.should(QueryBuilders.termsQuery("sysCreateAid",paras.getSysCreateAids()));
sourceBuilder.query(builder);
//排序
if(StringUtils.isBlank(paras.getKeywords()) && paras.getOrderType()!=3) {