From 91784a0a9539b7f0b03d5cdf3a387ecba56af3ef Mon Sep 17 00:00:00 2001 From: "lims1@hunktimes.com" Date: Wed, 9 Aug 2023 16:47:45 +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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/course/api/CoursePortalApi.java | 30 ++----------------- 1 file changed, 2 insertions(+), 28 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 dba636b2..bffa8f81 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 @@ -261,44 +261,18 @@ public class CoursePortalApi extends ApiBaseController{ preview=true; } -// StudyCourse sc = new StudyCourse(); -// sc.setCourseId(course.getId()); -// sc.setAid(aid); - log.debug("=--------- 开始查询是否学习过此课程 ---------------------------------course.getId()= "+ course.getId() + ",aid = " + aid ); -// PageList rs1= studyCourseService.findPage(1,10, sc, OrderCondition.desc("id"),null); StudyCourse studyCourse = studyCourseService.findByCourseIdAndAid(course.getId(), aid); - log.debug("=--------- 开始查询是否学习过此课程 ---------------------------------course.getId()= "+ course.getId() + ",aid = " + aid +",studyCourse = " + studyCourse); boolean pass = false; if(!preview) { - log.debug("=--------- 开始查询受众信息 ---------------------------------aid = " + aid); - String token = request.getHeader("XBOE-Access-Token"); - log.debug("=--------- 获取token token = " + token); if (!courseCrowdList.isEmpty()) { for (CourseCrowd c : courseCrowdList) { //同一个受众，同一个只会有一条记录，所以这里就直接查询了 -// List hasItem = userGroupService.findByGroupIdAndAid(c.getGroupId(),aid); - - log.debug("=--------- 开始调研用户中心受众接口 groupId = " + c.getGroupId()); - List allAudienceList = thirdApi.getAllAudienceList(AuditListParam.builder().audienceId(c.getGroupId()).pageSize(1000).pageNo(1).build(), token); - List userIdList = allAudienceList.stream().map(AuditList::getUserId).collect(Collectors.toList()); - log.debug("=--------- allAudienceList: " +allAudienceList); - /* - List userDynamicList = thirdApi.getAllUserdynamicList(UserdynamicParam.builder().aid(Long.parseLong(aid)).pageSize(1000).pageIndex(1).build(), token); - log.error("=--------- 开始查询课程信息信息 ---------------------------------userDynamicList = " + userDynamicList); - List dynamicList = userDynamicList.stream().map(UserDynamic::getContentId).map(Long::parseLong).collect(Collectors.toList()); - log.error(id + "=--------- 开始查询课程信息信息 ---------------------------------dynamicList = " + dynamicList);*/ - - - if (userIdList.contains(Long.parseLong(aid)) || !Objects.isNull(studyCourse)) { + List hasItem = userGroupService.findByGroupIdAndAid(c.getGroupId(),aid); + if (hasItem != null && !hasItem.isEmpty() || !Objects.isNull(studyCourse)) { pass = true; break; } } -// if (!pass) { -// //return badRequest("您无学习此课程的权限，请与管理员联系"); -// return wrap(JsonResponseStatus.NO_CONTENT, "您无学习此课程的权限，请与管理员联系",rs); -// } - }else { pass = true; }