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 bdf5eb23..b308a739 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 @@ -6,6 +6,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import com.xboe.module.usergroup.entity.UserGroupItem; +import com.xboe.module.usergroup.service.IUserGroupService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -77,6 +79,9 @@ public class StudyCourseApi extends ApiBaseController{ @Autowired IStudySignupService signupService; + + @Autowired + private IUserGroupService userGroupService; /** * 用于查询课程的学习记录 @@ -153,6 +158,19 @@ public class StudyCourseApi extends ApiBaseController{ if(crowd!=null && crowd) { rs.put("crowds",courseCrowdList); } + + boolean pass = false; + if (!courseCrowdList.isEmpty()) { + for (CourseCrowd c : courseCrowdList) { + //同一个受众,同一个只会有一条记录,所以这里就直接查询了 + List hasItem = userGroupService.findByGroupIdAndAid(c.getGroupId(),aid); + if (hasItem != null && !hasItem.isEmpty()) { + pass = true; + break; + } + } + } + List cclist=contentService.getByCourseId(cid); List sectionlist=sectionService.getByCourseId(cid); List teachers=courseService.findTeachersByCourseId(cid); @@ -165,8 +183,8 @@ public class StudyCourseApi extends ApiBaseController{ } } - - + + rs.put("isCrowd",pass); rs.put("contents",cclist); rs.put("sections",sectionlist); rs.put("teachers",teachers);