|
@@ -779,7 +779,7 @@
|
|
|
<select id="queryCanAddStudent" resultMap="com.ym.mec.biz.dal.dao.MusicGroupDao.BasicUserDto">
|
|
|
select su.id_ user_id_,su.username_,su.phone_,s.name_ subject_name_ from student_registration sr
|
|
|
LEFT JOIN sys_user su ON su.id_ = sr.user_id_
|
|
|
- LEFT JOIN `subject` s ON s.id_ = sr.subject_id_
|
|
|
+ LEFT JOIN `subject` s ON s.id_ = sr.actual_subject_id_
|
|
|
where sr.music_group_id_ = #{musicGroupId} AND sr.music_group_status_ = 'NORMAL' AND sr.user_id_ NOT IN (
|
|
|
SELECT DISTINCT mgpcd.user_id_ FROM music_group_payment_calender_detail mgpcd left join music_group_payment_calender mgpc on mgpcd.music_group_payment_calender_id_ = mgpc.id_
|
|
|
WHERE mgpc.batch_no_ = #{batchNo} and mgpc.music_group_id_ = #{musicGroupId}
|
|
@@ -788,7 +788,7 @@
|
|
|
AND (sr.user_id_ = #{search} OR su.username_ LIKE CONCAT('%',#{search},'%'))
|
|
|
</if>
|
|
|
<if test="subjectId != null">
|
|
|
- AND sr.subject_id_ = #{subjectId}
|
|
|
+ AND sr.actual_subject_id_ = #{subjectId}
|
|
|
</if>
|
|
|
</select>
|
|
|
|