From 0d23c997942672e439d8d8d9dcfd52756bf3e546 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 19:10:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E8=97=8F=E8=AE=B0=E5=BD=95=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=B8=8D=E6=AD=A3=E7=A1=AE=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/CourseCollectServiceImpl.java        | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

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 1ab11c7a..5f5ccd29 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
@@ -11,6 +11,7 @@ import com.sqx.common.utils.PageUtils;
 import com.sqx.common.utils.Result;
 import com.sqx.modules.course.dao.CourseClassificationDao;
 import com.sqx.modules.course.dao.CourseCollectDao;
+import com.sqx.modules.course.dao.CourseDao;
 import com.sqx.modules.course.entity.Course;
 import com.sqx.modules.course.entity.CourseCollect;
 import com.sqx.modules.course.entity.CourseDetails;
@@ -22,13 +23,17 @@ import org.springframework.cache.annotation.CachePut;
 import org.springframework.stereotype.Service;
 
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Set;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
+import java.util.stream.Collectors;
 
 @Service
 public class CourseCollectServiceImpl extends ServiceImpl<CourseCollectDao, CourseCollect> implements CourseCollectService {
 
+    private final CourseDao courseDao;
     @Autowired
     private CourseClassificationDao courseClassificationDao;
     @Autowired
@@ -36,6 +41,10 @@ public class CourseCollectServiceImpl extends ServiceImpl<CourseCollectDao, Cour
 
     private ReentrantReadWriteLock reentrantReadWriteLock = new ReentrantReadWriteLock(true);
 
+    public CourseCollectServiceImpl(CourseDao courseDao) {
+        this.courseDao = courseDao;
+    }
+
     @Override
     @CacheEvict(value = "app:courseCollect", key = "#courseCollect.userId")
     public Result insertCourseCollect(CourseCollect courseCollect) {
@@ -107,7 +116,16 @@ public class CourseCollectServiceImpl extends ServiceImpl<CourseCollectDao, Cour
     @CachePut(value = "app:courseCollect", key = "#userId")
     public Result selectByUserId(Integer page, Integer limit, Long userId, Integer classify) {
         PageHelper.startPage(page, limit);
-        List<Course> courseList = baseMapper.selectCourseByCollect(userId, classify);
+        Set<Long> courseIdList = baseMapper.selectList(new LambdaQueryWrapper<CourseCollect>()
+                        .eq(CourseCollect::getUserId, userId)
+                        .eq(CourseCollect::getClassify, classify)
+                        .isNotNull(CourseCollect::getCourseId)
+                        .select(CourseCollect::getCourseId, CourseCollect::getUserId))
+                .stream().map(CourseCollect::getCourseId).collect(Collectors.toSet());
+//        List<CourseCollect> collectList = baseMapper.selectByUserId(userId, classify);
+//        Set<Long> courseIdList = collectList.stream().map(CourseCollect::getCourseId).collect(Collectors.toSet());
+        List<Course> courseList = courseIdList.isEmpty() ? new ArrayList<>() : courseDao.selectList(new LambdaQueryWrapper<Course>().in(Course::getCourseId, courseIdList));
+//        List<Course> courseList = baseMapper.selectCourseByCollect(userId, classify);
         PageInfo<Course> pageInfo = new PageInfo<>(courseList);
         if (CollectionUtil.isNotEmpty(courseList)) {
             List<Course> courses = pageInfo.getList();