From 766e310d8d31e3d61cec561486c50ce82451ad6c Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Tue, 7 Jan 2025 16:12:00 +0800
Subject: [PATCH] =?UTF-8?q?group=20by=E9=97=AE=E9=A2=98=20=E5=92=8C=20?=
 =?UTF-8?q?=E5=89=A7=E9=9B=86=E4=B8=BA=E7=A9=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../course/service/impl/CourseCollectServiceImpl.java        | 5 ++++-
 src/main/resources/mapper/course/CourseCollectDao.xml        | 1 +
 src/main/resources/mapper/course/CourseDetailsDao.xml        | 1 -
 3 files changed, 5 insertions(+), 2 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 749d1665..70fe0886 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
@@ -148,6 +148,9 @@ public class CourseCollectServiceImpl extends ServiceImpl<CourseCollectDao, Cour
         //详情id
         Set<Long> courseDetailIds = new HashSet<>();
         courses.forEach(s -> {
+            if (s == null) {
+                return;
+            }
             courseIdList.add(s.getCourseId());
             courseDetailIds.add(s.getCourseDetailsId());
         });
@@ -157,7 +160,7 @@ public class CourseCollectServiceImpl extends ServiceImpl<CourseCollectDao, Cour
         List<CourseDetails> courseDetails1 = courseIdList.isEmpty() ? new ArrayList<>() :
                 courseDetailsService.list(new LambdaQueryWrapper<CourseDetails>().in(CourseDetails::getCourseDetailsId, courseDetailIds));
         Map<Long, CourseDetails> courseDetailsMap = courseDetails1.stream().collect(Collectors.toMap(CourseDetails::getCourseId, item -> item));
-        List<CourseDetails> courseDetails2 = courseDetailsDao.countByCourseId(courseIdList);
+        List<CourseDetails> courseDetails2 = courseIdList.isEmpty() ? new ArrayList<>() : courseDetailsDao.countByCourseId(courseIdList);
         Map<Long, Integer> countMap = courseDetails2.stream()
                 .collect(Collectors.toMap(CourseDetails::getCourseId, CourseDetails::getCourseDetailsCount));
 
diff --git a/src/main/resources/mapper/course/CourseCollectDao.xml b/src/main/resources/mapper/course/CourseCollectDao.xml
index 6c57db52..d4fcaac1 100644
--- a/src/main/resources/mapper/course/CourseCollectDao.xml
+++ b/src/main/resources/mapper/course/CourseCollectDao.xml
@@ -49,6 +49,7 @@
         FROM `course_collect` c1
         WHERE c1.classify = 3
           AND c1.user_id = #{userId}
+        group by c1.course_id
         order by c1.create_time desc
     </select>
 </mapper>
diff --git a/src/main/resources/mapper/course/CourseDetailsDao.xml b/src/main/resources/mapper/course/CourseDetailsDao.xml
index d1446b43..8192981b 100644
--- a/src/main/resources/mapper/course/CourseDetailsDao.xml
+++ b/src/main/resources/mapper/course/CourseDetailsDao.xml
@@ -112,7 +112,6 @@
         <foreach collection="courseIdList" item="ids" open="(" separator="," close=")">
             #{ids}
         </foreach>
-        GROUP BY course_id
     </select>
 
 </mapper>