Merge remote-tracking branch 'origin/master'

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

@@ -475,7 +475,8 @@
 			LEFT JOIN cooperation_organ co ON mg.school_id_ = co.id_
 		<include refid="queryArrearageStudentsCondition"/>
 		GROUP BY
-			mgpc.music_group_id_,mgpcd.user_id_;
+			mgpc.music_group_id_,mgpcd.user_id_
+		<include refid="global.limit" />
 	</select>
 
 	<select id="countArrearageStudents" resultType="int">

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

@@ -118,12 +118,11 @@
   ]]></select>
 
     <select id="queryPage" resultMap="TeacherCourseStatistics" parameterType="map">
-        SELECT tcs.*,u.real_name_,u.phone_,o.name_ organ_name_,DATE_FORMAT(tcs.month_,'%Y年%m月') month_str_,
-        s.id_ subject_id,s.name_ subject_name FROM teacher_course_statistics tcs
+        SELECT tcs.*,u.real_name_,u.phone_,o.name_ organ_name_,DATE_FORMAT(tcs.month_,'%Y年%m月') month_str_
+        FROM teacher_course_statistics tcs
         LEFT JOIN sys_user u ON tcs.user_id_ = u.id_
         LEFT JOIN teacher t ON t.id_ = tcs.user_id_
         LEFT JOIN organization o ON tcs.organ_id_ = o.id_
-        LEFT JOIN subject s ON FIND_IN_SET(s.id_,tcs.subject_id_list_)
         <include refid="queryParams"/>
         <include refid="global.limit"/>
     </select>