|
@@ -506,12 +506,10 @@
|
|
|
LEFT JOIN sys_user su ON sr.user_id_ = su.id_
|
|
LEFT JOIN sys_user su ON sr.user_id_ = su.id_
|
|
|
LEFT JOIN `subject` s ON s.id_ = sr.actual_subject_id_
|
|
LEFT JOIN `subject` s ON s.id_ = sr.actual_subject_id_
|
|
|
LEFT JOIN music_group mg ON sr.music_group_id_ = mg.id_
|
|
LEFT JOIN music_group mg ON sr.music_group_id_ = mg.id_
|
|
|
|
|
+ LEFT JOIN student stu ON sr.user_id_ = stu.user_id_
|
|
|
<if test="classGroupId != null">
|
|
<if test="classGroupId != null">
|
|
|
LEFT JOIN class_group_student_mapper cgsm ON cgsm.music_group_id_ = sr.music_group_id_
|
|
LEFT JOIN class_group_student_mapper cgsm ON cgsm.music_group_id_ = sr.music_group_id_
|
|
|
</if>
|
|
</if>
|
|
|
- <if test="carePackage != null or comeOnPackage != null">
|
|
|
|
|
- LEFT JOIN student stu ON sr.user_id_ = stu.user_id_
|
|
|
|
|
- </if>
|
|
|
|
|
<include refid="queryMusicGroupStudentSql"/>
|
|
<include refid="queryMusicGroupStudentSql"/>
|
|
|
ORDER BY sr.id_ DESC
|
|
ORDER BY sr.id_ DESC
|
|
|
<include refid="global.limit"/>
|
|
<include refid="global.limit"/>
|
