diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CoursePortalApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CoursePortalApi.java index 74ad4619..4a7c940c 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CoursePortalApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CoursePortalApi.java @@ -267,12 +267,15 @@ public class CoursePortalApi extends ApiBaseController{ // 此课程是否包含此aid用户 // 例外情况判断 boolean pass = false; - if (!courseCrowdList.isEmpty()) { + if (!Objects.isNull(studyCourse)){ + pass = true; + } + if (Objects.isNull(studyCourse) && !courseCrowdList.isEmpty()) { List audienceList = Arrays.asList(audiences.split(",")); // 此用户所在受众组 log.error("---------------参数------------ audienceList = " + audienceList); for (CourseCrowd c : courseCrowdList) { for (String audience :audienceList){ - if (Objects.isNull(studyCourse) || c.getGroupId().equals(audience)) { + if (c.getGroupId().equals(audience)) { pass = true; break; } @@ -285,6 +288,7 @@ public class CoursePortalApi extends ApiBaseController{ pass = true; } + log.error("=--------- 是否有权限查看此课程: " +pass); List cclist=contentService.getByCourseId(id); List sectionlist=sectionService.getByCourseId(id); diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java index 71f9f338..62cc2810 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java @@ -173,12 +173,15 @@ public class StudyCourseApi extends ApiBaseController{ // 此课程是否包含此aid用户 // 例外情况判断 boolean pass = false; - if (!courseCrowdList.isEmpty()) { + if (!Objects.isNull(studyCourse)){ + pass = true; + } + if (Objects.isNull(studyCourse) && !courseCrowdList.isEmpty()) { List audienceList = Arrays.asList(audiences.split(",")); // 此用户所在受众组 log.error("---------------参数------------ audienceList = " + audienceList); for (CourseCrowd c : courseCrowdList) { for (String audience :audienceList){ - if (Objects.isNull(studyCourse) || c.getGroupId().equals(audience)) { + if (c.getGroupId().equals(audience)) { pass = true; break; }