Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -165,8 +165,8 @@
 		LEFT JOIN music_group_payment_calender mgpc ON mgpc.id_ = mgpcd.music_group_payment_calender_id_
 		<where>
 			mgpc.music_group_id_ = sr.music_group_id_
-			<if test="userId != null">
-				AND mgpcd.user_id_ = #{userId}
+			<if test="search != null and search != ''">
+				AND (mgpcd.user_id_ = #{search} OR su.username_ LIKE CONCAT('%',#{search},'%'))
 			</if>
 			<if test="id != null">
 				AND mgpcd.music_group_payment_calender_id_ = #{id}
@@ -187,9 +187,10 @@
 		SELECT COUNT(DISTINCT mgpcd.id_) FROM music_group_payment_calender_detail mgpcd
 		LEFT JOIN student_registration sr ON sr.user_id_ = mgpcd.user_id_
 		LEFT JOIN `subject` st ON st.id_ = sr.actual_subject_id_
+		LEFT JOIN sys_user su ON su.id_ = mgpcd.user_id_
 		<where>
-			<if test="userId != null">
-				AND mgpcd.user_id_ = #{userId}
+			<if test="search != null and search != ''">
+				AND (mgpcd.user_id_ = #{search} OR su.username_ LIKE CONCAT('%',#{search},'%'))
 			</if>
 			<if test="id != null">
 				AND mgpcd.music_group_payment_calender_id_ = #{id}