Merge remote-tracking branch 'origin/saas' into saas

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

@@ -4045,7 +4045,7 @@
         FROM student_attendance sa
         LEFT JOIN student s ON s.user_id_ = sa.user_id_
         left join student_registration sr on sr.user_id_ = sa.user_id_ and sr.music_group_id_ = sa.music_group_id_
-        LEFT JOIN `subject` sb ON sb.id_ = sr.subject_id_
+        LEFT JOIN `subject` sb ON sb.id_ = sr.actual_subject_id_
         LEFT JOIN sys_user su ON su.id_ = s.user_id_
         WHERE sa.id_ IS NOT NULL AND sa.course_schedule_id_ = #{courseScheduleId} AND sa.status_ IN ('NORMAL','LATE')
         <include refid="global.limit"/>

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

@@ -839,7 +839,7 @@
 		LEFT JOIN sys_user su ON su.id_ = cssp.user_id_
 		LEFT JOIN student st ON st.user_id_ = cssp.user_id_
         left join student_registration sr on sr.user_id_ = cssp.user_id_ and sr.music_group_id_ = cssp.music_group_id_
-        LEFT JOIN `subject` s ON s.id_ = sr.subject_id_
+        LEFT JOIN `subject` s ON s.id_ = sr.actual_subject_id_
 		WHERE cssp.course_schedule_id_ = #{courseScheduleId}
 	</select>
 	<select id="hasCourse" resultType="java.lang.Boolean">

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

@@ -228,7 +228,7 @@
 			LEFT JOIN student stu ON stu.user_id_ = sees.student_id_
             left join student_registration sr on sees.student_id_ = sr.user_id_ and sr.music_group_id_ = sees.music_group_id_
 			LEFT JOIN sys_user su ON su.id_ = sees.student_id_
-			LEFT JOIN `subject` sub ON sub.id_ = sr.subject_id_
+			LEFT JOIN `subject` sub ON sub.id_ = sr.actual_subject_id_
 		WHERE
 			sees.monday_ = #{startDate}
 			AND sees.teacher_id_ = #{teacherId}