|
@@ -124,7 +124,7 @@ public class RoomServiceImpl implements RoomService {
|
|
|
log.info("join error: roomId = {}, userName = {}, isAudience = {}", roomId, userName, isAudience);
|
|
|
throw new ApiException(ErrorEnum.ERR_OVER_MAX_COUNT);
|
|
|
}
|
|
|
- /*if (!isAudience) {
|
|
|
+ if (!isAudience) {
|
|
|
List<RoomMember> assistantList = roomMemberDao.findByRidAndRole(roomId, RoleEnum.RoleAssistant.getValue());
|
|
|
if (!assistantList.isEmpty()) {
|
|
|
if (count == 1) {
|
|
@@ -137,12 +137,12 @@ public class RoomServiceImpl implements RoomService {
|
|
|
}
|
|
|
} else {
|
|
|
roleEnum = RoleEnum.RoleAudience;
|
|
|
- }*/
|
|
|
- if(teacher == null){
|
|
|
+ }
|
|
|
+ /*if(teacher == null){
|
|
|
roleEnum = RoleEnum.RoleStudent;
|
|
|
}else {
|
|
|
roleEnum = RoleEnum.RoleTeacher;
|
|
|
- }
|
|
|
+ }*/
|
|
|
saveRoomMember(userId, userName, roomId, roleEnum.getValue(), !isDisableCamera, curTime);
|
|
|
IMApiResultInfo resultInfo = imHelper.joinGroup(new String[]{userId}, roomId, roomId);
|
|
|
if (!resultInfo.isSuccess()) {
|