From 3841c95b56d30c9671126572ac7158541a0a0f88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Fri, 3 Jan 2025 21:58:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/CourseCollectServiceImpl.java   | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

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<CourseCollectDao, Cour
 
         List<Course> courseList = courseIdList.isEmpty() ? new ArrayList<>() : courseDao.selectList(new LambdaQueryWrapper<Course>().in(Course::getCourseId, courseIdList));
 //        List<Course> courseList = baseMapper.selectCourseByCollect(userId, classify);
-        Set<Long> detailIdList = courseList.stream().map(Course::getCourseDetailsId).collect(Collectors.toSet());
-        Map<Long, String> courseDetailsMap = detailIdList.isEmpty() ? new HashMap<>() : courseDetailsService.list(new LambdaQueryWrapper<CourseDetails>()
-                        .in(CourseDetails::getCourseDetailsId, detailIdList)
-                        .select(CourseDetails::getCourseDetailsName)).stream()
-                .collect(Collectors.toMap(CourseDetails::getCourseDetailsId, CourseDetails::getCourseDetailsName));
+        Set<Long> detailIdList = courseCollectList.stream().map(CourseCollect::getCourseDetailsId).collect(Collectors.toSet());
+        Map<Long, CourseDetails> courseDetailsMap = detailIdList.isEmpty() ? new HashMap<>() : courseDetailsService.list(new LambdaQueryWrapper<CourseDetails>()
+                        .in(CourseDetails::getCourseDetailsId, detailIdList)).stream()
+                .collect(Collectors.toMap(CourseDetails::getCourseDetailsId, item->item));
         PageInfo<Course> pageInfo = new PageInfo<>(courseList);
         if (CollectionUtil.isNotEmpty(courseList)) {
             List<Course> 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));