Merge remote-tracking branch 'origin/20221010' into 20221010

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

@@ -1732,12 +1732,12 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             viewMap.put(regCalender.getMusicGroupId(), true);
         }
 
-        Map<String, List<MusicGroupPaymentCalender>> musicGroupBatchNoTimes = musicGroupPaymentCalenderDao.getMusicGroupCalenderBatchNoByIds(ids).stream().collect(Collectors.groupingBy(MusicGroupPaymentCalender::getMusicGroupId));
+        /*Map<String, List<MusicGroupPaymentCalender>> musicGroupBatchNoTimes = musicGroupPaymentCalenderDao.getMusicGroupCalenderBatchNoByIds(ids).stream().collect(Collectors.groupingBy(MusicGroupPaymentCalender::getMusicGroupId));
         musicGroupBatchNoTimes.forEach((musicGroupId, calenders) -> {
             if (viewMap.containsKey(musicGroupId) && calenders.size() > 1) {
                 viewMap.remove(musicGroupId);
             }
-        });
+        });*/
         return viewMap;
     }