|
@@ -1363,7 +1363,12 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
List<Integer> classGroupIdList = classGroupStudentMapperDao.queryClassGroupIdList(musicGroupId, userId, GroupType.MUSIC);
|
|
|
//更新学员在班级的状态
|
|
|
for (Integer classGroupId : classGroupIdList) {
|
|
|
- classGroupStudentMapperService.delClassGroupStudent(userId, classGroupId);
|
|
|
+ ClassGroup classGroup = classGroupService.get(classGroupId);
|
|
|
+ if(classGroup.getType().equals(ClassGroupTypeEnum.MUSIC_NETWORK)){
|
|
|
+ classGroupService.delSingle(classGroupId);
|
|
|
+ }else {
|
|
|
+ classGroupStudentMapperService.delClassGroupStudent(userId, classGroupId);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
//删除续费周期
|
|
@@ -1459,7 +1464,12 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
|
|
|
List<Integer> classGroupIdList = classGroupStudentMapperDao.queryClassGroupIdList(musicGroupId, userId, GroupType.MUSIC);
|
|
|
for (Integer classGroupId : classGroupIdList) {
|
|
|
- classGroupStudentMapperService.delClassGroupStudent(userId, classGroupId);
|
|
|
+ ClassGroup classGroup = classGroupService.get(classGroupId);
|
|
|
+ if(classGroup.getType().equals(ClassGroupTypeEnum.MUSIC_NETWORK)){
|
|
|
+ classGroupService.delSingle(classGroupId);
|
|
|
+ }else {
|
|
|
+ classGroupStudentMapperService.delClassGroupStudent(userId, classGroupId);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
//删除续费周期
|