update

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

@@ -163,8 +163,6 @@ public class ImNetworkRoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNe
             userRole = RoleEnum.RoleTeacher;
         }
         log.info("joinRoom params：roomId:{},userRole:{},userId:{}",roomId,userRole,userId);
-        BasicUserInfo sysUser = Optional.ofNullable(teacherDao.getBasicUserInfo(userId)).
-                orElseThrow(()-> new BizException("用户信息不存在"));
 
         ImNetworkRoomResult joinRoomResult = new ImNetworkRoomResult();
         //初始化房间信息
@@ -175,8 +173,9 @@ public class ImNetworkRoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNe
         BeanUtils.copyProperties(room,joinRoomResult);
         //定时销毁房间
         //初始化房间用户信息
+        String imUserId = imGroupService.getImUserId(userId, userRole);
         ImNetworkRoomMember roomMember = imNetworkRoomMemberService.lambdaQuery().eq(ImNetworkRoomMember::getRoomId,roomId)
-                .eq(ImNetworkRoomMember::getUserId,userId).last("LIMIT 1").one();
+                .eq(ImNetworkRoomMember::getUserId,imUserId).last("LIMIT 1").one();
         joinRoomResult.setUserInfo(roomMember);
         //获取教室剩余时长
         joinRoomResult.setSurplusTime(DateUtil.secondsBetween(new Date(), courseSchedule.getEndTime()));
@@ -208,8 +207,9 @@ public class ImNetworkRoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNe
             Map<Long, List<CourseScheduleStudentMusicSheetResult>> musicSheetResultMap = musicSheetResults.stream().
                     collect(Collectors.groupingBy(CourseScheduleStudentMusicSheet::getUserId));
             roomMemberList.forEach(e -> {
-                if (musicSheetResultMap.containsKey(e.getUserId())) {
-                    e.setMusicSheetResults(musicSheetResultMap.get(e.getUserId()));
+                Long userId = Long.parseLong(imGroupService.analysisImUserId(e.getUserId()));
+                if (musicSheetResultMap.containsKey(userId)) {
+                    e.setMusicSheetResults(musicSheetResultMap.get(userId));
                 }
             });
         }