Browse Source

修复接口调整时序问题

Eric 1 year ago
parent
commit
09d9dca7fa
1 changed files with 6 additions and 4 deletions
  1. 6 4
      mec-im/src/main/java/com/ym/service/Impl/RoomServiceImpl.java

+ 6 - 4
mec-im/src/main/java/com/ym/service/Impl/RoomServiceImpl.java

@@ -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;