刘俊驰 hai 5 meses
pai
achega
dd06cbea19

+ 16 - 0
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/MusicSheetServiceImpl.java

@@ -374,6 +374,22 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
                 }
             }
         }
+        if (query.getId() != null) {
+            List<AlbumMusicRelate> list = albumMusicRelateService.lambdaQuery()
+                    .eq(AlbumMusicRelate::getAlbumId, query.getId())
+                    .in(AlbumMusicRelate::getMusicSheetId, records.stream().map(MusicSheetVo::getId).collect(Collectors.toList()))
+                    .list();
+            if (CollectionUtils.isNotEmpty(list)) {
+                Map<Long, AlbumMusicRelate> collect = list.stream().collect(Collectors.toMap(AlbumMusicRelate::getMusicSheetId, o -> o, (o1, o2) -> o1));
+                for (MusicSheetVo record : records) {
+                    AlbumMusicRelate albumMusicRelate = collect.get(record.getId());
+                    if (albumMusicRelate != null) {
+                        record.setAlbumCategoryLevelId(albumMusicRelate.getAlbumCategoryLevelId());
+                        record.setAlbumCategoryTypeId(albumMusicRelate.getAlbumCategoryTypeId());
+                    }
+                }
+            }
+        }
         
         // 设置专辑
         List<Long> albumCategoryIds = records.stream().flatMap(o -> Lists.newArrayList(o.getAlbumCategoryTypeId(), o.getAlbumCategoryLevelId()).stream())

+ 0 - 2
cooleshow-user/user-biz/src/main/resources/config/mybatis/MusicSheetMapper.xml

@@ -327,8 +327,6 @@
         ,(select group_concat(s.name_) from subject s
             where find_in_set(s.id_,t.music_subject_) and s.del_flag_ = 0 ) as subjectNames
         ,amr.sort_number_ as albumSortNumber
-        ,amr.album_category_level_id_ as albumCategoryLevelId
-        ,amr.album_category_type_id_ as albumCategoryTypeId
         from music_sheet t
         left join album_music_relate amr on t.id_ = amr.music_sheet_id_
         left join sys_user su on t.create_by_ = su.id_