diff --git a/src/main/java/com/sqx/modules/course/service/impl/CourseCollectServiceImpl.java b/src/main/java/com/sqx/modules/course/service/impl/CourseCollectServiceImpl.java index 77ae873d..026b8696 100644 --- a/src/main/java/com/sqx/modules/course/service/impl/CourseCollectServiceImpl.java +++ b/src/main/java/com/sqx/modules/course/service/impl/CourseCollectServiceImpl.java @@ -128,18 +128,22 @@ public class CourseCollectServiceImpl extends ServiceImpl courseList = courseIdList.isEmpty() ? new ArrayList<>() : courseDao.selectList(new LambdaQueryWrapper().in(Course::getCourseId, courseIdList)); // List courseList = baseMapper.selectCourseByCollect(userId, classify); - Set detailIdList = courseList.stream().map(Course::getCourseDetailsId).collect(Collectors.toSet()); - Map courseDetailsMap = detailIdList.isEmpty() ? new HashMap<>() : courseDetailsService.list(new LambdaQueryWrapper() - .in(CourseDetails::getCourseDetailsId, detailIdList) - .select(CourseDetails::getCourseDetailsName)).stream() - .collect(Collectors.toMap(CourseDetails::getCourseDetailsId, CourseDetails::getCourseDetailsName)); + Set detailIdList = courseCollectList.stream().map(CourseCollect::getCourseDetailsId).collect(Collectors.toSet()); + Map courseDetailsMap = detailIdList.isEmpty() ? new HashMap<>() : courseDetailsService.list(new LambdaQueryWrapper() + .in(CourseDetails::getCourseDetailsId, detailIdList)).stream() + .collect(Collectors.toMap(CourseDetails::getCourseDetailsId, item->item)); PageInfo pageInfo = new PageInfo<>(courseList); if (CollectionUtil.isNotEmpty(courseList)) { List courses = pageInfo.getList(); for (Course course : courses) { course.setCourseClassification(courseClassificationDao.selectById(course.getClassifyId())); CourseCollect courseCollect = courseCollectHashMap.get(course.getCourseId()); - course.setCourseDetailsName(courseCollect == null ? null : courseDetailsMap.get(courseCollect.getCourseDetailsId())); + CourseDetails courseDetails = courseCollect == null ? null : courseDetailsMap.get(courseCollect.getCourseDetailsId()); + if (courseDetails != null) { + course.setCourseDetailsName(courseDetails.getCourseDetailsName()); + course.setCourseDetailsId(courseDetails.getCourseDetailsId()); + course.setCourseDetailsCount(courseDetails.getCourseDetailsCount()); + } } } return Result.success().put("data", PageUtils.page(pageInfo, true));