From 3bcc848b7c62fbbfc3afcc5752d69fddc95b6be0 Mon Sep 17 00:00:00 2001 From: "joshen@zcwytd.com" <12345678A> Date: Fri, 24 Nov 2023 18:39:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xboe/module/elasticsearc/CourseElasticsearchImpl.java | 4 ++-- .../java/com/xboe/module/course/api/CourseFullTextApi.java | 2 ++ 2 files changed, 4 insertions(+), 2 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 39b04b3b..8602968d 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 @@ -372,11 +372,11 @@ public class CourseElasticsearchImpl implements ICourseFullTextSearch{ //has.must(QueryBuilders.termsQuery("audience", ids)); has.must(QueryBuilders.termsQuery("audiences", params.getAudiences())); //查询出例外人员创建的课程 - /*if(params.getSysCreateAids()!=null && params.getSysCreateAids().length>0) { + if(params.getSysCreateAids()!=null && params.getSysCreateAids().length>0) { BoolQueryBuilder exception =QueryBuilders.boolQuery(); exception.must(QueryBuilders.termsQuery("sysCreateAid",params.getSysCreateAids())); audience.should(exception); - }*/ + } //查询报名的课程 if(params.getCourseId()!=null && params.getCourseId().length>0) { BoolQueryBuilder exception =QueryBuilders.boolQuery(); diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseFullTextApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseFullTextApi.java index da96207e..5f97e5ac 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseFullTextApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseFullTextApi.java @@ -221,7 +221,9 @@ public class CourseFullTextApi extends ApiBaseController{ if (StringUtils.isEmpty(token)) { token = request.getHeader("token"); } + log.info("根据userId查询面授课id dto.getUserId() = " + dto.getUserId() + ",token = " + token); List offCourseId = thirdApi.getOffCourseId(dto.getUserId(),token); + log.info("根据userId查询面授课id offCourseId.size() = " + offCourseId ); String offCourseIds = ""; if (!Objects.isNull(offCourseId) && offCourseId.size() > 0){ offCourseIds = String.join(",", offCourseId);