浏览代码

fix:声部

liujc 1 年之前
父节点
当前提交
6b495dfd77

+ 1 - 1
mec-biz/src/main/java/com/ym/mec/biz/service/impl/UserMusicServiceImpl.java

@@ -278,7 +278,7 @@ public class UserMusicServiceImpl extends ServiceImpl<UserMusicMapper, UserMusic
 
                     record.setCurrentGradeNum(student.getCurrentGradeNum());
                     record.setCurrentClass(student.getCurrentClass());
-                    record.setSubjectId(student.getSubjectId());
+                    record.setSubjectId(student.getSubjectIdList());
                     record.setVipFlag(student.getMembershipEndTime() != null && student.getMembershipEndTime().after(new Date()));
                 }
             } else {

+ 3 - 2
mec-biz/src/main/java/com/ym/mec/biz/service/impl/UserMusicStarServiceImpl.java

@@ -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);