1、检测冲突时排除删除的课程

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

@@ -1225,7 +1225,8 @@
             cs.schoole_id_
         FROM
             course_schedule cs
-            WHERE (cs.class_date_ BETWEEN DATE_FORMAT(#{startTime},'%Y%m%d') AND DATE_FORMAT(#{endTime},'%Y%m%d'))
+        WHERE (cs.class_date_ BETWEEN DATE_FORMAT(#{startTime},'%Y%m%d') AND DATE_FORMAT(#{endTime},'%Y%m%d'))
+            AND cs.del_flag_!=1 AND cg.del_flag_!=1
     </select>
     
     <select id="queryStudentCoursesTimesOfTomorrow" resultMap="Mapper">