Merge branch 'local/1030-music' into test

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

@@ -255,6 +255,7 @@ public class UserMusicServiceImpl extends ServiceImpl<UserMusicMapper, UserMusic
         List<Long> teacherIds = records.stream().filter(o -> o.getClientType() == ClientEnum.TEACHER).map(UserMusicWrapper.UserMusic::getUserId).collect(Collectors.toList());
 
         Map<Long, Teacher> teacherMap = teacherService.getMapByIds(teacherIds);
+        studentIds.addAll(teacherIds);
         Map<Long, com.yonge.cooleshow.biz.dal.entity.SysUser> userMap = sysUserService.getMapByIds(studentIds);
 
         for (UserMusicWrapper.UserMusic record : records) {

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

@@ -93,6 +93,7 @@ public class UserMusicStarServiceImpl extends ServiceImpl<UserMusicStarMapper, U
             .map(UserMusicStarWrapper.UserMusicStar::getUserId).collect(Collectors.toList());
 
         Map<Long, Teacher> teacherMap = teacherService.getMapByIds(teacherIds);
+        studentIds.addAll(teacherIds);
         Map<Long, com.yonge.cooleshow.biz.dal.entity.SysUser> userMap = sysUserService.getMapByIds(studentIds);
 
         for (UserMusicStarWrapper.UserMusicStar userMusicStar : userMusicStars) {