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

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

@@ -1677,7 +1677,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
 //        }
 
         List<String> musicGroupIds = studentRegistrationDao.queryStudentMusicGroup(practiceGroup.getStudentId());
-        if(!CollectionUtils.isEmpty(musicGroupIds)){
+        if(!CollectionUtils.isEmpty(musicGroupIds)&&musicGroupIds.size()<=1){
             MusicGroup musicGroup = musicGroupDao.get(musicGroupIds.get(0));
             if(Objects.nonNull(musicGroup)){
                 practiceGroup.setEducationalTeacherId(musicGroup.getEducationalTeacherId());
@@ -2712,7 +2712,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
 
         if(Objects.isNull(practiceGroupBuyParams.getEducationalTeacherId())){
             List<String> musicGroupIds = studentRegistrationDao.queryStudentMusicGroup(practiceGroupBuyParams.getStudentId());
-            if(!CollectionUtils.isEmpty(musicGroupIds)){
+            if(!CollectionUtils.isEmpty(musicGroupIds)&&musicGroupIds.size()<=1){
                 MusicGroup musicGroup = musicGroupDao.get(musicGroupIds.get(0));
                 if(Objects.nonNull(musicGroup)){
                     practiceGroupBuyParams.setEducationalTeacherId(musicGroup.getEducationalTeacherId());