Merge branch 'master' of http://git.dayaedu.com/yonge/edu-saas

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

@@ -230,6 +230,7 @@ public class RoomServiceImpl implements RoomService {
             }
             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);
         } else {
             roleEnum = RoleEnum.getEnumByValue(roomMember.getRole());
             if(roleEnum == Student){
@@ -247,7 +248,6 @@ public class RoomServiceImpl implements RoomService {
             }
             log.info("user exist in the room: roomId={} , userId={}, use the last role={}", roomId, userId, roleEnum);
         }
-        roomMember = roomMemberDao.findByRidAndUid(roomId, userId);
         userResult.setMicrophone(roomMember.isMic());
         userResult.setCamera(roomMember.isCamera());
         userResult.setHandUp(roomMember.isHand());