1、陪练课调整

mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleServiceImpl.java

@@ -735,8 +735,6 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         //将课程计划按照开课时间排序
         allCourseSchedules.sort(Comparator.comparing(CourseSchedule::getStartClassTime));
         if (allCourseSchedules.size() > 1) {
-            //记录连续冲突的次数
-            int repeatTimes = 1;
             for (CourseSchedule preCourseSchedule : courseSchedules) {
                 for (CourseSchedule backCourseSchedule : allCourseSchedules) {
                     //判断前后两节课是否存在冲突

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

@@ -2278,7 +2278,7 @@
             AND cgtm.`teacher_role_` = 'BISHOP'
             LEFT JOIN `course_schedule` cs ON cs.`class_group_id_` = cg.`id_`
         WHERE
-            cgtm.user_id_=#{userId}
+            cgsm.user_id_=#{userId}
             AND cgtm.teacher_role_='BISHOP'
             AND cgsm.status_ = 'NORMAL'
             AND cg.`type_` IN ( 'NORMAL', 'HIGH', 'VIP' )