bug修改

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

@@ -1081,6 +1081,7 @@
             AND cs.status_ != 'NOT_START'
             AND cs.del_flag_ = 0
             AND (cs.is_lock_=0 OR cs.is_lock_ IS NULL) AND cs.pre_course_flag_ = 0
+            AND (cs.new_course_id_ IS NULL OR cs.new_course_id_ = 0)
             <if test="teachMode!=null and teachMode!=''">
                 AND cs.teach_mode_=#{teachMode}
             </if>
@@ -2691,12 +2692,13 @@
         FROM course_schedule_student_payment cssp
                  LEFT JOIN course_schedule cs ON cssp.course_schedule_id_ = cs.id_
         WHERE (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
-          AND cssp.user_id_ = #{userId}
-          <if test="groupType != null">
-          	and cs.group_type_ = #{groupType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
-          </if>
-          AND #{startTime} &lt; CONCAT(cs.class_date_, ' ', cs.end_class_time_)
-          AND #{endTime} &gt; CONCAT(cs.class_date_, ' ', cs.start_class_time_);
+        AND (cs.new_course_id_ IS NULL OR cs.new_course_id_ = 0) AND cs.pre_course_flag_ = 0
+        AND cssp.user_id_ = #{userId}
+        <if test="groupType != null">
+        and cs.group_type_ = #{groupType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+        </if>
+        AND #{startTime} &lt; CONCAT(cs.class_date_, ' ', cs.end_class_time_)
+        AND #{endTime} &gt; CONCAT(cs.class_date_, ' ', cs.start_class_time_);
     </select>
     <select id="queryStudentContinueCourse" resultMap="CourseSchedule">
         SELECT cs.*