|
@@ -140,10 +140,11 @@ public class CourseChapterSectionServiceImpl extends ServiceImpl<CourseChapterSe
|
|
@Override
|
|
@Override
|
|
public List<CourseUserChapterSectionVo> sectionList(CourseMenuQueryBo bo) {
|
|
public List<CourseUserChapterSectionVo> sectionList(CourseMenuQueryBo bo) {
|
|
List<CourseUserChapterSectionVo> courseUserChapterSectionVos = courseChapterSectionMapper.sectionList(bo);
|
|
List<CourseUserChapterSectionVo> courseUserChapterSectionVos = courseChapterSectionMapper.sectionList(bo);
|
|
|
|
+ List<CourseUserChapterSectionVo> examList = courseChapterSectionMapper.examList(bo);
|
|
if (!CollectionUtils.isEmpty(courseUserChapterSectionVos)) {
|
|
if (!CollectionUtils.isEmpty(courseUserChapterSectionVos)) {
|
|
- bo.setModuleId(courseUserChapterSectionVos.get(0).getModuleId());
|
|
|
|
- bo.setChapterId(courseUserChapterSectionVos.get(0).getChapterId());
|
|
|
|
- courseUserChapterSectionVos.addAll(courseChapterSectionMapper.examList(bo));
|
|
|
|
|
|
+ courseUserChapterSectionVos.addAll(examList);
|
|
|
|
+ }else{
|
|
|
|
+ courseUserChapterSectionVos = examList;
|
|
}
|
|
}
|
|
if (bo.getUserId() != null) {
|
|
if (bo.getUserId() != null) {
|
|
for (CourseUserChapterSectionVo courseMenuVo : courseUserChapterSectionVos) {
|
|
for (CourseUserChapterSectionVo courseMenuVo : courseUserChapterSectionVos) {
|