|
@@ -6,9 +6,11 @@ import java.util.Date;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
+import java.util.Optional;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
+import com.google.common.collect.Lists;
|
|
|
import com.yonge.cooleshow.biz.dal.dto.CourseMusicAlbumRelationDto;
|
|
|
import com.yonge.cooleshow.biz.dal.entity.CourseRelationMusicAlbum;
|
|
|
import com.yonge.cooleshow.biz.dal.enums.course.CourseTypeEnum;
|
|
@@ -270,12 +272,13 @@ public class VideoLessonGroupServiceImpl extends ServiceImpl<VideoLessonGroupDao
|
|
|
List<Long> updateCourseRelationIdList = new ArrayList<>();
|
|
|
for (VideoLessonGroupDetailDto videoLessonGroupDetailDto : lessonList) {
|
|
|
// 需要修改的关联数据
|
|
|
- List<CourseMusicAlbumRelationDto> relationList = videoLessonGroupDetailDto.getRelationList();
|
|
|
+ List<CourseMusicAlbumRelationDto> relationList = Optional.ofNullable(videoLessonGroupDetailDto.getRelationList())
|
|
|
+ .orElse(Lists.newArrayList());
|
|
|
|
|
|
videoLessonGroupDetailDto.setCourseRelationMusicAlbumList(new ArrayList<>());
|
|
|
// 原本的关联数据
|
|
|
- List<CourseRelationMusicAlbum> oldRelationList = courseRelationMusicAlbumList.get(
|
|
|
- videoLessonGroupDetailDto.getId());
|
|
|
+ List<CourseRelationMusicAlbum> oldRelationList = courseRelationMusicAlbumList.getOrDefault(
|
|
|
+ videoLessonGroupDetailDto.getId(), Lists.newArrayList());
|
|
|
|
|
|
for (CourseMusicAlbumRelationDto courseMusicAlbumRelationDto : relationList) {
|
|
|
CourseRelationMusicAlbum courseRelationMusicAlbum = new CourseRelationMusicAlbum();
|