|
@@ -531,7 +531,7 @@ public class RoomServiceImpl implements RoomService {
|
|
|
userResult.setHandUpOn(false);
|
|
|
userResult.setJoinTime(curTime);
|
|
|
if (Optional.ofNullable(joinRoom).orElse(true)) {
|
|
|
- saveRoomMember(userId, sysUser.getAvatar(), userName, roomId, roleEnum.getValue(), curTime, microphone);
|
|
|
+ member = saveRoomMember(userId, sysUser.getAvatar(), userName, roomId, roleEnum.getValue(), curTime, microphone);
|
|
|
}
|
|
|
} else {
|
|
|
roleEnum = RoleEnum.getEnumByValue(member.getRole());
|
|
@@ -574,9 +574,11 @@ public class RoomServiceImpl implements RoomService {
|
|
|
if (TencentCloudRTCPlugin.PLUGIN_NAME.equals(roomResult.getServiceProvider())) {
|
|
|
|
|
|
// 网络教室人员信息
|
|
|
- RoomMember roomMember = roomMemberDao.findByRidAndUid(roomId, userId);
|
|
|
- // 发送消息
|
|
|
- sendDisplayMessage(display, roomMember);
|
|
|
+// RoomMember roomMember = roomMemberDao.findByRidAndUid(roomId, userId);
|
|
|
+ if (Objects.nonNull(member)) {
|
|
|
+ // 发送消息
|
|
|
+ sendDisplayMessage(display, member);
|
|
|
+ }
|
|
|
}
|
|
|
} else {
|
|
|
ExamSongDownloadData examSongDownloadData;
|