视频关联曲目修改

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/VideoLessonGroupServiceImpl.java

@@ -260,11 +260,9 @@ public class VideoLessonGroupServiceImpl extends ServiceImpl<VideoLessonGroupDao
                         .eq(CourseRelationMusicAlbum::getCourseGroupId,  lessonGroupId)
                         .ne(CourseRelationMusicAlbum::getDelFlog, 0)
                         .list();
-        Map<Long, List<CourseRelationMusicAlbum>> courseRelationMusicAlbumList = new HashMap<>();
-        // 根据课程id分组
+
         if (CollectionUtils.isEmpty(relationMusicAlbumList)) {
-            courseRelationMusicAlbumList = relationMusicAlbumList.stream()
-                         .collect(Collectors.groupingBy(CourseRelationMusicAlbum::getCourseId));
+            relationMusicAlbumList = new ArrayList<>();
         }
 
         // 需要更新的id
@@ -275,17 +273,14 @@ public class VideoLessonGroupServiceImpl extends ServiceImpl<VideoLessonGroupDao
                     .orElse(Lists.newArrayList());
 
             videoLessonGroupDetailDto.setCourseRelationMusicAlbumList(new ArrayList<>());
-            // 原本的关联数据
-            List<CourseRelationMusicAlbum> oldRelationList = courseRelationMusicAlbumList.getOrDefault(
-                    videoLessonGroupDetailDto.getId(), Lists.newArrayList());
 
             for (CourseMusicAlbumRelationDto courseMusicAlbumRelationDto : relationList) {
                 CourseRelationMusicAlbum courseRelationMusicAlbum = new CourseRelationMusicAlbum();
                 // 修改的数据
                 if (courseMusicAlbumRelationDto.getRelationId() != null && courseMusicAlbumRelationDto.getRelationId() != 0) {
-                    updateCourseRelationIdList.add(courseMusicAlbumRelationDto.getRelationId());
-                    for (CourseRelationMusicAlbum relationMusicAlbum : oldRelationList) {
+                    for (CourseRelationMusicAlbum relationMusicAlbum : relationMusicAlbumList) {
                         if (relationMusicAlbum.getId().equals(courseMusicAlbumRelationDto.getRelationId())) {
+                            updateCourseRelationIdList.add(courseMusicAlbumRelationDto.getRelationId());
                             courseRelationMusicAlbum = relationMusicAlbum;
                             break;
                         }