From 185f5dc7c3c49f565da51cd9c2f7750f30990d4a Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 11 十一月 2024 13:28:29 +0800
Subject: [PATCH] 代码提交

---
 xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/service/impl/CourseServiceImpl.java |   28 ++++++++++++++++++++++------
 1 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/service/impl/CourseServiceImpl.java b/xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/service/impl/CourseServiceImpl.java
index 077e643..4f99b11 100644
--- a/xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/service/impl/CourseServiceImpl.java
+++ b/xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/service/impl/CourseServiceImpl.java
@@ -1,14 +1,19 @@
 package com.xinquan.course.service.impl;
 
 import com.alibaba.nacos.common.utils.StringUtils;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xinquan.common.core.utils.page.CollUtils;
 import com.xinquan.common.core.utils.page.PageDTO;
-import com.xinquan.course.domain.Course;
+import com.xinquan.course.api.domain.Course;
+import com.xinquan.course.api.domain.CourseChapter;
+import com.xinquan.course.domain.CourseLearningRecord;
 import com.xinquan.course.domain.vo.ClientCourseVO;
 import com.xinquan.course.mapper.CourseMapper;
 import com.xinquan.course.service.CourseService;
+
+import java.util.List;
 import java.util.Objects;
 import org.springframework.stereotype.Service;
 
@@ -35,14 +40,25 @@
     @Override
     public PageDTO<ClientCourseVO> getCoursePageList(String courseTitle, Long cateId,
             Integer pageCurr, Integer pageSize) {
-        Page<Course> page = this.lambdaQuery()
-                .like(StringUtils.isNotBlank(courseTitle), Course::getCourseTitle, courseTitle)
-                .eq(Objects.nonNull(cateId), Course::getCateId, cateId)
-                .orderByDesc(Course::getSortNum)
-                .page(new Page<>(pageCurr, pageSize));
+        LambdaQueryWrapper<Course> courseLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        if (org.springframework.util.StringUtils.hasLength(courseTitle)){
+            courseLambdaQueryWrapper.like(Course::getCourseTitle, courseTitle);
+        }
+        if (cateId!=null && cateId.equals(1853706016887824386L)){
+            courseLambdaQueryWrapper.eq(Course::getCourseType,2);
+        }else if (cateId!=null){
+            courseLambdaQueryWrapper.eq(Course::getCateId, cateId);
+        }
+        if (cateId==null){
+            courseLambdaQueryWrapper.eq(Course::getRecommend,1);
+        }
+        courseLambdaQueryWrapper.eq(Course::getListingStatus,1);
+        courseLambdaQueryWrapper.orderByDesc(Course::getSortNum);
+        Page<Course> page = this.page(new Page<>(pageCurr, pageSize),courseLambdaQueryWrapper);
         if (CollUtils.isEmpty(page.getRecords())) {
             return PageDTO.empty(page);
         }
+
         return PageDTO.of(page, ClientCourseVO.class);
     }
 }

--
Gitblit v1.7.1