Merge remote-tracking branch 'origin/master'

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

@@ -195,7 +195,6 @@ public class RoomServiceImpl implements RoomService {
             userResult.setHandUpOn(false);
             userResult.setJoinTime(curTime);
             saveRoomMember(userId,sysUser.getAvatar(), userName, roomId, roleEnum.getValue(), curTime);
-            imHelper.joinGroup(new String[]{userId}, roomId, roomId);
         } else {
             roleEnum = RoleEnum.getEnumByValue(member.getRole());
             if(roleEnum == RoleTeacher){
@@ -206,6 +205,7 @@ public class RoomServiceImpl implements RoomService {
             userResult.setHandUpOn(member.isHand());
             userResult.setJoinTime(member.getJoinDt());
         }
+        imHelper.joinGroup(new String[]{userId}, roomId, roomId);
 
         List<CourseScheduleStudentMusicScore> scheduleStudentMusicScores = courseScheduleStudentMusicScoreDao.queryByScoreIdAndCourseId(null, courseId,null, null, null);