Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TeacherLeaveRecordServiceImpl.java

@@ -100,7 +100,9 @@ public class TeacherLeaveRecordServiceImpl extends BaseServiceImpl<Long, Teacher
 					list.add(his.getAfter());
 				}
 
-				checkCourseSchedulePlansExitLeaveRecord(list);
+				if(list.size() > 0){
+					checkCourseSchedulePlansExitLeaveRecord(list);
+				}
 			}
 		}
 		teacherLeaveRecordDao.insert(teacherLeaveRecord);

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

@@ -453,6 +453,7 @@
     <select id="countStudyNum" resultType="java.lang.Integer">
         SELECT COUNT(sr.user_id_) FROM student_registration sr
         WHERE sr.music_group_id_ = #{musicGroupId}
+        AND sr.payment_status_ = 2
         AND sr.music_group_status_ != 'QUIT'
     </select>