From 5be07b1a021f596b003eac001f4cb77416ae6c7b Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 11 十二月 2024 17:08:47 +0800
Subject: [PATCH] 修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCourseController.java | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCourseController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCourseController.java
index 06cd114..cb3c74d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCourseController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCourseController.java
@@ -107,16 +107,26 @@
@PostMapping(value = "/list")
public R<Page<TCourse>> list(@RequestBody CourseQuery informationQuery) {
Long userId = tokenService.getLoginUser().getUserId();
-
- Page<TCourse> page = courseService.lambdaQuery()
- .like(!StringUtils.isEmpty(informationQuery.getName()), TCourse::getCourseName, informationQuery.getName())
- .eq(informationQuery.getRegionId() != null, TCourse::getRegionId, informationQuery.getRegionId())
- .eq(informationQuery.getTechnicalId() != null, TCourse::getTechnicalId, informationQuery.getTechnicalId())
- .eq(informationQuery.getMajorId() != null, TCourse::getMajorId, informationQuery.getMajorId())
- .eq(informationQuery.getLevel() != null, TCourse::getLevel, informationQuery.getLevel())
- .orderByDesc(TCourse::getCommitteeSort)
- .page(Page.of(informationQuery.getPageNum(), informationQuery.getPageSize()));
-
+ Page<TCourse> page;
+ if (informationQuery.getSortType()==1){
+ page = courseService.lambdaQuery()
+ .like(!StringUtils.isEmpty(informationQuery.getName()), TCourse::getCourseName, informationQuery.getName())
+ .eq(informationQuery.getRegionId() != null, TCourse::getRegionId, informationQuery.getRegionId())
+ .eq(informationQuery.getTechnicalId() != null, TCourse::getTechnicalId, informationQuery.getTechnicalId())
+ .eq(informationQuery.getMajorId() != null, TCourse::getMajorId, informationQuery.getMajorId())
+ .eq(informationQuery.getLevel() != null, TCourse::getLevel, informationQuery.getLevel())
+ .orderByDesc(TCourse::getCreateTime)
+ .page(Page.of(informationQuery.getPageNum(), informationQuery.getPageSize()));
+ }else {
+ page = courseService.lambdaQuery()
+ .like(!StringUtils.isEmpty(informationQuery.getName()), TCourse::getCourseName, informationQuery.getName())
+ .eq(informationQuery.getRegionId() != null, TCourse::getRegionId, informationQuery.getRegionId())
+ .eq(informationQuery.getTechnicalId() != null, TCourse::getTechnicalId, informationQuery.getTechnicalId())
+ .eq(informationQuery.getMajorId() != null, TCourse::getMajorId, informationQuery.getMajorId())
+ .eq(informationQuery.getLevel() != null, TCourse::getLevel, informationQuery.getLevel())
+ .orderByDesc(TCourse::getCommitteeSort)
+ .page(Page.of(informationQuery.getPageNum(), informationQuery.getPageSize()));
+ }
Set<Long> cacheSet = redisCache.getCacheSet("COURSE:" + userId);
--
Gitblit v1.7.1