|
@@ -311,11 +311,10 @@ public class TenantAlbumMusicServiceImpl extends ServiceImpl<TenantAlbumMusicMap
|
|
|
}
|
|
|
|
|
|
// 声部
|
|
|
- List<Long> subjectIds = musicSheets.stream()
|
|
|
+ String subjectIds = musicSheets.stream()
|
|
|
.map(MusicSheet::getMusicSubject)
|
|
|
- .filter(StringUtils::isNotBlank).distinct()
|
|
|
- .map(Long::parseLong).collect(Collectors.toList());
|
|
|
- if (CollectionUtils.isNotEmpty(subjectIds)) {
|
|
|
+ .filter(StringUtils::isNotBlank).collect(Collectors.joining(","));
|
|
|
+ if (StringUtils.isNotEmpty(subjectIds)) {
|
|
|
List<Subject> subjects = subjectService.findBySubjectByIdList(subjectIds);
|
|
|
data.setSubjects(subjects);
|
|
|
}
|