update

mec-biz/src/main/resources/config/mybatis/DemoGroupMapper.xml

@@ -236,16 +236,16 @@
 
     <select id="findTeacherDemoGroups" resultType="com.ym.mec.biz.dal.dto.TeacherManageDemoGroupListDto">
         SELECT
-        cs.class_date_ classDate,
-        GROUP_CONCAT(DISTINCT CONCAT(cs.start_class_time_,' ',cs.end_class_time_)) startTimes,
-        GROUP_CONCAT(DISTINCT s.name_) subjectNames
+            cs.class_date_ classDate,
+            GROUP_CONCAT(DISTINCT CONCAT(cs.start_class_time_,' ',cs.end_class_time_)) startTimes,
+            GROUP_CONCAT(DISTINCT s.name_) subjectNames
         FROM
-        demo_group dg
-        LEFT JOIN class_group cg ON dg.id_=cg.music_group_id_ AND cg.group_type_='DEMO'
-        LEFT JOIN course_schedule cs ON cg.id_=cs.class_group_id_
-        LEFT JOIN `subject` s ON s.id_ = cg.subject_id_list_
+          demo_group dg
+            LEFT JOIN class_group cg ON dg.id_=cg.music_group_id_ AND cg.group_type_='DEMO'
+            LEFT JOIN course_schedule cs ON cg.id_=cs.class_group_id_
+            LEFT JOIN `subject` s ON s.id_ = dg.subject_id_
         WHERE cs.type_ = 'DEMO' AND dg.user_id_ = #{teacherId}
-        GROUP BY cs.class_date_
+          GROUP BY cs.class_date_
         <include refid="global.limit"/>
     </select>
     <select id="countTeacherDemoGroups" resultType="Integer">

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

@@ -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()) {