Merge remote-tracking branch 'origin/master'

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

@@ -928,7 +928,9 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 			
 			//更新班级人数
 			List<Integer> classGroupIdList = classGroupStudentMapperDao.queryClassGroupIdList(musicGroupId, userId, GroupType.MUSIC);
-			classGroupDao.batchUpdateStudentNumMinusOne(classGroupIdList);
+			if (classGroupIdList != null && classGroupIdList.size() > 0) {
+				classGroupDao.batchUpdateStudentNumMinusOne(classGroupIdList);
+			}
 			
 			// 删除未上课
 			courseScheduleService.batchDeleteMusicGroupCourseWithStudent(musicGroupId, userId, GroupType.MUSIC);
@@ -1016,7 +1018,9 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 		
 		//更新班级人数
 		List<Integer> classGroupIdList = classGroupStudentMapperDao.queryClassGroupIdList(musicGroupId, userId, GroupType.MUSIC);
-		classGroupDao.batchUpdateStudentNumMinusOne(classGroupIdList);
+		if (classGroupIdList != null && classGroupIdList.size() > 0) {
+			classGroupDao.batchUpdateStudentNumMinusOne(classGroupIdList);
+		}
 		
 		// 删除未上课
 		courseScheduleService.batchDeleteMusicGroupCourseWithStudent(musicGroupId, userId, GroupType.MUSIC);

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

@@ -160,6 +160,5 @@
         <foreach collection="classGroupIds" item="classGroupId" index="index" open="(" close=")" separator=",">
             #{classGroupId}
         </foreach>
-        AND group_type_='MUSIC'
     </delete>
 </mapper>