|
|
@@ -243,9 +243,10 @@
|
|
|
<select id="queryFeeStudents" resultMap="FeeStudentDto">
|
|
|
SELECT su.id_,su.username_,su.gender_,s.name_,mgsf.course_fee_,mgsf.music_group_id_
|
|
|
FROM music_group_student_fee_ mgsf
|
|
|
+ LEFT JOIN student_registration sr ON sr.music_group_id_ = mgsf.music_group_id_
|
|
|
LEFT JOIN sys_user su ON su.id_ = mgsf.user_id_
|
|
|
LEFT JOIN `subject` s ON s.id_ = mgsf.subject_id_
|
|
|
- WHERE mgsf.music_group_id_ = #{musicGroupId}
|
|
|
+ WHERE mgsf.music_group_id_ = #{musicGroupId} AND sr.user_id_ = mgsf.user_id_ AND sr.music_group_status_ = 'NORMAL'
|
|
|
<if test="search != null and search != ''">
|
|
|
AND (su.id_ = #{search} OR su.username_ LIKE CONCAT('%',#{search},'%')
|
|
|
OR su.phone_ LIKE CONCAT('%',#{search},'%'))
|
Joburgess