Merge branch 'zx_saas_0810' of http://git.dayaedu.com/yonge/mec into master_saas

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/CourseScheduleDao.java

@@ -1830,7 +1830,6 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
      */
     List<Map<Integer, Long>> countPreSubMinutesByClassGroupId(@Param("classGroupSet") List<Integer> classGroupSet, @Param("courseDetailId") Integer courseDetailId);
 
-
     /**
      * 获取班级预排课时长
      * @param classGroupSet

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

@@ -4056,7 +4056,7 @@
         from course_schedule_student_payment cssp
         left join course_schedule cs ON cs.id_ = cssp.course_schedule_id_
         left join sys_user su on cs.actual_teacher_id_ = su.id_
-        left join cooperation_organ co ON co.id_ = cs.schoole_id_
+        left join school co ON co.id_ = cs.schoole_id_
         left join student_attendance sa ON sa.course_schedule_id_ = cs.id_ AND sa.user_id_ = cssp.user_id_
         where cssp.music_group_id_ = #{queryInfo.groupId} AND cssp.user_id_ = #{queryInfo.userId} AND cssp.group_type_ = #{queryInfo.groupType}
         <if test="queryInfo.courseStatus != null and queryInfo.courseStatus != ''">