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

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

@@ -21,6 +21,7 @@
 		<result column="open_" property="open" />
 		<association property="sysUser" javaType="com.ym.mec.auth.api.entity.SysUser">
 			<result column="username_" property="username" />
+			<result column="phone_" property="phone" />
 		</association>
 		<association property="studentRegistration" javaType="com.ym.mec.biz.dal.entity.StudentRegistration">
 			<result column="subject_names_" property="subjectName" />
@@ -157,7 +158,7 @@
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="MusicGroupPaymentCalenderDetail"
 		parameterType="map">
-		SELECT mgpcd.*,su.username_,st.name_ subject_names_,sr.music_group_status_
+		SELECT mgpcd.*,su.username_,su.phone_,st.name_ subject_names_,sr.music_group_status_
 		FROM music_group_payment_calender_detail mgpcd
 		LEFT JOIN sys_user su ON su.id_ = mgpcd.user_id_
 		LEFT JOIN student_registration sr ON sr.user_id_ = mgpcd.user_id_
@@ -166,7 +167,7 @@
 		<where>
 			mgpc.music_group_id_ = sr.music_group_id_
 			<if test="search != null and search != ''">
-				AND (mgpcd.user_id_ = #{search} OR su.username_ LIKE CONCAT('%',#{search},'%'))
+				AND (mgpcd.user_id_ = #{search} OR su.username_ LIKE CONCAT('%',#{search},'%') OR su.phone_ LIKE CONCAT('%',#{search},'%'))
 			</if>
 			<if test="id != null">
 				AND mgpcd.music_group_payment_calender_id_ = #{id}
@@ -190,7 +191,7 @@
 		LEFT JOIN sys_user su ON su.id_ = mgpcd.user_id_
 		<where>
 			<if test="search != null and search != ''">
-				AND (mgpcd.user_id_ = #{search} OR su.username_ LIKE CONCAT('%',#{search},'%'))
+				AND (mgpcd.user_id_ = #{search} OR su.username_ LIKE CONCAT('%',#{search},'%') OR su.phone_ LIKE CONCAT('%',#{search},'%'))
 			</if>
 			<if test="id != null">
 				AND mgpcd.music_group_payment_calender_id_ = #{id}