|
|
@@ -77,7 +77,7 @@ public class BCourseInfoServiceImpl extends ServiceImpl<BCourseInfoMapper, BCour
|
|
|
queryWrapper.eq("course_id", id);
|
|
|
queryWrapper.orderByAsc("sort");
|
|
|
List<BCourseTimePo> list = bCourseTimeService.list(queryWrapper);
|
|
|
- Map<String, List<BCourseTimePo>> map = list.stream().collect(Collectors.groupingBy(BCourseTimePo::getBackType));
|
|
|
+ Map<String, List<BCourseTimePo>> map = list.stream().filter(item->item.getBackType() != null).collect(Collectors.groupingBy(BCourseTimePo::getBackType));
|
|
|
bCourseInfoDto.setBCourseTimeList(BeanUtil.copyToList(map.get("0"), BCourseTimeDto.class));
|
|
|
bCourseInfoDto.setBCourseTimeBackList(BeanUtil.copyToList(map.get("1"), BCourseTimeDto.class));
|
|
|
|
|
|
@@ -85,7 +85,7 @@ public class BCourseInfoServiceImpl extends ServiceImpl<BCourseInfoMapper, BCour
|
|
|
queryWrapper6.eq("course_id", id);
|
|
|
queryWrapper6.orderByAsc("sort");
|
|
|
List<BCoursePrePo> list6 = bCoursePreService.list(queryWrapper6);
|
|
|
- Map<String, List<BCoursePrePo>> map1 = list6.stream().collect(Collectors.groupingBy(BCoursePrePo::getBackType));
|
|
|
+ Map<String, List<BCoursePrePo>> map1 = list6.stream().filter(item->item.getBackType() != null).collect(Collectors.groupingBy(BCoursePrePo::getBackType));
|
|
|
bCourseInfoDto.setBCoursePreList(BeanUtil.copyToList(map1.get("0"), BCoursePreDto.class));
|
|
|
bCourseInfoDto.setBCoursePreBackList(BeanUtil.copyToList(map1.get("1"), BCoursePreDto.class));
|
|
|
|