update

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

@@ -240,7 +240,7 @@ public class RoomServiceImpl implements RoomService {
         if(roomMember == null){
             return ;
         }
-        Room room = roomDao.findByLockRid(roomId);
+
         log.info("joinRoomSuccess : roomId={}, userId={}", roomId, userId);
         RoleEnum roleEnum = RoleEnum.getEnumByValue(roomMember.getRole());
         CourseSchedule schedule = courseScheduleDao.get(Long.parseLong(roomId.substring(1)));
@@ -250,14 +250,11 @@ public class RoomServiceImpl implements RoomService {
             //如果是老师加入房间，调整节拍器状态
             courseScheduleStudentPaymentDao.adjustPlayMidi(schedule.getId(),null,null);
             display = "display://type=1?userId=" + userId + "?uri=";
-            updateDisplay(roomId, userId, display, 0);
         }else if (roleEnum == RoleEnum.RoleAssistant){
             display = "display://type=0?userId=" + userId + "?uri=";
-            updateDisplay(roomId, userId, display, 0);
         }
-
         Date curTime = DateTimeUtils.currentUTC();
-
+        Room room = roomDao.findByLockRid(roomId);
         if (room == null) {
             //如果房间不存在，删除除了自己之外的其他用户
 //            roomMemberDao.deleteRoomMember(roomId,userId);
@@ -268,6 +265,10 @@ public class RoomServiceImpl implements RoomService {
                 throw new ApiException(ErrorEnum.ERR_CREATE_ROOM_ERROR, resultInfo.getErrorMessage());
             }
         }
+        if(roleEnum == RoleTeacher || roleEnum == RoleEnum.RoleAssistant){
+            updateDisplay(roomId, userId, display, 0);
+        }
+
         UserInfo userInfo = userDao.findByUid(userId);
         if (userInfo == null) {
             userInfo = new UserInfo();