|
@@ -111,7 +111,9 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
|
|
|
Set<Integer> subjectIds = dataList.stream().map(e -> e.getActualSubjectId()).collect(Collectors.toSet());
|
|
|
Map<Integer,String> subjectMap = MapUtil.convertIntegerMap(musicGroupSubjectPlanDao.findSubjectMap(subjectIds,queryInfo.getMusicGroupId()));
|
|
|
dataList.forEach(e->{
|
|
|
- e.setKitGroupPurchaseTypeEnum(KitGroupPurchaseTypeEnum.valueOf(subjectMap.get(e.getActualSubjectId())));
|
|
|
+ if(StringUtils.isNotBlank(subjectMap.get(e.getActualSubjectId()))){
|
|
|
+ e.setKitGroupPurchaseTypeEnum(KitGroupPurchaseTypeEnum.valueOf(subjectMap.get(e.getActualSubjectId())));
|
|
|
+ }
|
|
|
});
|
|
|
}
|
|
|
if (count == 0) {
|