From c37819d6b0d7c5355be269ef8fa0933df3e6b8ed Mon Sep 17 00:00:00 2001 From: "lims1@hunktimes.com" Date: Wed, 9 Aug 2023 19:31:10 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=8F=97=E4=BC=97=E6=9D=83?= =?UTF-8?q?=E9=99=90=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xboe/module/course/api/CoursePortalApi.java | 8 ++++++-- .../java/com/xboe/school/study/api/StudyCourseApi.java | 7 +++++-- 2 files changed, 11 insertions(+), 4 deletions(-) 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; }