|
@@ -101,7 +101,7 @@ public class UserMusicStarServiceImpl extends ServiceImpl<UserMusicStarMapper, U
|
|
|
if (userMusicStar.getClientType() == ClientEnum.STUDENT) {
|
|
|
Student student = studentMap.get(userMusicStar.getUserId().intValue());
|
|
|
if (student != null) {
|
|
|
- userMusicStar.setSubjectId(student.getSubjectId());
|
|
|
+ userMusicStar.setSubjectId(student.getSubjectIdList());
|
|
|
}
|
|
|
} else {
|
|
|
Teacher teacher = teacherMap.get(userMusicStar.getUserId().intValue());
|
|
@@ -121,7 +121,8 @@ public class UserMusicStarServiceImpl extends ServiceImpl<UserMusicStarMapper, U
|
|
|
}
|
|
|
|
|
|
// 声部ID集合
|
|
|
- List<Integer> subjectIds = studentMap.values().stream().map(Student::getSubjectId).filter(StringUtils::isNotBlank).map(Integer::parseInt).collect(Collectors.toList());
|
|
|
+ List<Integer> subjectIds = userMusicStars.stream().map(UserMusicStarWrapper.UserMusicStar::getSubjectId)
|
|
|
+ .filter(StringUtils::isNotBlank).map(Integer::parseInt).collect(Collectors.toList());
|
|
|
|
|
|
Map<Integer, Subject> subjectMap =
|
|
|
subjectService.getMapByIds(subjectIds);
|