update

edu-im/edu-im-server/src/main/java/com/keao/edu/im/service/Impl/RoomServiceImpl.java

@@ -191,8 +191,7 @@ public class RoomServiceImpl implements RoomService {
                 roleEnum = Student;
             }
             log.info("user join the room: roomId={} , userId={}, roleEnum={}", roomId, userId, roleEnum);
-            saveRoomMember(userId,sysUser.getAvatar(), realName, roomId, roleEnum.getValue(),true, curTime,registrationId);
-            roomMember = roomMemberDao.findByRidAndUid(roomId, userId);
+            roomMember = saveRoomMember(userId,sysUser.getAvatar(), realName, roomId, roleEnum.getValue(),true, curTime,registrationId);
         } else {
             roleEnum = RoleEnum.getEnumByValue(roomMember.getRole());
             if(roleEnum == Student){
@@ -234,7 +233,7 @@ public class RoomServiceImpl implements RoomService {
         roomDao.save(room);
     }
 
-    private void saveRoomMember(String userId, String headUrl, String userName, String roomId, int role, boolean cameraOn, Date joinTime,Long examRegistrationId) {
+    private RoomMember saveRoomMember(String userId, String headUrl, String userName, String roomId, int role, boolean cameraOn, Date joinTime,Long examRegistrationId) {
         RoomMember roomMember = new RoomMember();
         roomMember.setUid(userId);
         roomMember.setName(userName);
@@ -248,6 +247,7 @@ public class RoomServiceImpl implements RoomService {
             roomMember.setMsidFlag(true);
         }
         roomMemberDao.save(roomMember);
+        return roomMember;
     }
 
     public void leaveRoomSuccess(RoomMember roomMember) throws Exception {