update

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/CourseScheduleStudentMusicSheet.java

@@ -50,7 +50,7 @@ public class CourseScheduleStudentMusicSheet implements Serializable {
 
     @TableField("user_type_")
     @ApiModelProperty(value = "0学生1老师")
-    private Integer userType = 0;
+    private Integer userType;
 
     @TableField("speed_")
     @ApiModelProperty(value = "播放速度")

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

@@ -221,12 +221,11 @@ public class ImNetworkRoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNe
                 queryBySheetIdAndCourseId(null,courseScheduleId,null,null,null);
         if (!CollectionUtils.isEmpty(musicSheetResults)) {
             //分组塞到学员列表中
-            Map<Long, List<CourseScheduleStudentMusicSheetResult>> musicSheetResultMap = musicSheetResults.stream().
-                    collect(Collectors.groupingBy(CourseScheduleStudentMusicSheet::getUserId));
+            Map<String, List<CourseScheduleStudentMusicSheetResult>> musicSheetResultMap = musicSheetResults.stream().
+                    collect(Collectors.groupingBy(e-> imGroupService.getImUserId(e.getUserId(),e.getUserType()==1?RoleEnum.RoleTeacher:RoleEnum.RoleStudent)));
             roomMemberList.forEach(e -> {
-                Long userId = Long.parseLong(imGroupService.analysisImUserId(e.getUserId()));
-                if (musicSheetResultMap.containsKey(userId)) {
-                    e.setScheduleStudentMusicScores(musicSheetResultMap.get(userId));
+                if (musicSheetResultMap.containsKey(e.getUserId())) {
+                    e.setScheduleStudentMusicScores(musicSheetResultMap.get(e.getUserId()));
                 }
             });
         }