Merge remote-tracking branch 'origin/master'

cooleshow-user/user-biz/src/main/resources/config/mybatis/CourseHomeworkMapper.xml

@@ -54,12 +54,12 @@
         sch.submit_time_ as submitTime,
         su.id_ as teacherId,
         ch.create_time_ as decorateTime
-        from  course_homework ch
+        from course_homework ch
         left join course_schedule cs on ch.course_schedule_id_ = cs.id_
-        left join course_schedule_student_payment cssp on cssp.course_id_ = cs.id_
+        left join course_schedule_student_payment cssp on cssp.course_id_ = ch.course_schedule_id_
+        left join student_course_homework sch on sch.course_schedule_id_ = cssp.course_id_ and sch.student_id_ = cssp.user_id_
         left join sys_user su on cs.teacher_id_ = su.id_
         left join sys_user su2 on cssp.user_id_ = su2.id_
-        left join student_course_homework sch on sch.student_id_ = cssp.user_id_ and sch.course_schedule_id_ = cssp.course_id_
         <where>
             <if test="param.courseStatus != null">
                 and cs.status_ = #{param.courseStatus}