Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -2252,7 +2252,7 @@
         course_schedule cs
         LEFT JOIN school s ON cs.schoole_id_=s.id_
         <include refid="endFindCourseSchedulesCondition"/>
-        ORDER BY course_start_time_
+        ORDER BY course_start_time_,cs.id_
         <include refid="global.limit"/>
     </select>
     <select id="endCountCourseSchedules" resultType="int">
@@ -2338,6 +2338,7 @@
         <include refid="queryVipCourseScheduleIds"/>
     </select>
     <sql id="queryVipCourseScheduleIds">
+        (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
         <if test="startTime!=null and endTime==null">
             AND cs.class_date_ &gt; DATE_FORMAT(#{startTime},"%Y-%m-%d")
         </if>