From 83659f56c33968cc3c56057458657b00b7246c12 Mon Sep 17 00:00:00 2001
From: 670788339 <670788339@qq.com>
Date: Mon, 24 Jul 2023 21:01:40 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=8F=97=E4=BC=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/course/api/CoursePortalApi.java    | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 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 4afdfb4e..d25c8767 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
@@ -7,6 +7,8 @@ import java.util.Map;
 
 import javax.annotation.Resource;
 
+import com.xboe.core.JsonResponseStatus;
+import com.xboe.module.usergroup.entity.UserGroupItem;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -250,25 +252,27 @@ public class CoursePortalApi extends ApiBaseController{
 		if(preview==null) {
 			preview=true;
 		}
-		
+
+		boolean pass = false;
 		if(!preview) {
 			if (!courseCrowdList.isEmpty()) {
-//				boolean pass = false;
-//				for (CourseCrowd c : courseCrowdList) {
-//					//同一个受众，同一个只会有一条记录，所以这里就直接查询了
-//					List<UserGroupItem> hasItem = userGroupService.findByGroupIdAndAid(c.getGroupId(),aid);
-//					if (hasItem != null && !hasItem.isEmpty()) {
-//						pass = true;
-//						break;
-//					}
-//				}
+				for (CourseCrowd c : courseCrowdList) {
+					//同一个受众，同一个只会有一条记录，所以这里就直接查询了
+					List<UserGroupItem> hasItem = userGroupService.findByGroupIdAndAid(c.getGroupId(),aid);
+					if (hasItem != null && !hasItem.isEmpty()) {
+						pass = true;
+						break;
+					}
+				}
 //				if (!pass) {
 //					//return badRequest("您无学习此课程的权限，请与管理员联系");
 //					return wrap(JsonResponseStatus.NO_CONTENT, "您无学习此课程的权限，请与管理员联系",rs);
 //				}
+
 			}
 		}
 
+
 		List<CourseContent> cclist=contentService.getByCourseId(id);
 		List<CourseSection> sectionlist=sectionService.getByCourseId(id);
 		List<CourseTeacher> teachers=courseService.findTeachersByCourseId(id);
@@ -282,8 +286,8 @@ public class CoursePortalApi extends ApiBaseController{
 			}
 			
 		}
-		
-		
+
+		rs.put("isCrowd",pass);
 		rs.put("contents",cclist);
 		rs.put("sections",sectionlist);
 		rs.put("teachers",teachers);