Merge branch 'feature/0803-im'

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

@@ -394,6 +394,7 @@ public class ImNetworkRoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNe
                 musicSheet.setSpeed(accompaniment.getSpeed());
                 musicSheet.setCourseScheduleId(Long.parseLong(roomId));
                 musicSheet.setUserId(e);
+                musicSheet.setUserType(0);
                 scheduleStudentMusicSheetResults.add(musicSheet);
             });
             CourseScheduleStudentMusicSheetResult musicSheet = new CourseScheduleStudentMusicSheetResult();
@@ -434,7 +435,7 @@ public class ImNetworkRoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNe
     public void display(ImNetworkDisplayDataDto displayData) throws Exception {
         log.info("display in data = {}", displayData);
         CourseSchedule courseSchedule = courseScheduleService.getById(displayData.getRoomId());
-        displayData.setUserId(imGroupService.getImUserId(sysUserService.getUserId(),displayData.getClientType()));
+        displayData.setUserId(displayData.getUserId());
         displayData.setTeacherId(imGroupService.getImUserId(courseSchedule.getTeacherId(),RoleEnum.RoleTeacher));
         roomService.display(displayData,courseSchedule.getServiceProvider());
     }