From bebaa6cf607840666237c98c3640d344e44bb342 Mon Sep 17 00:00:00 2001 From: wangjinlei <751475802@qq.com> Date: Fri, 12 Apr 2024 15:16:11 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=B0=8Fbug=20=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/sociology/controller/CourseController.java | 8 +++++--- .../peanut/modules/sociology/service/CourseService.java | 2 +- .../modules/sociology/service/impl/CourseServiceImpl.java | 7 ++++--- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/peanut/modules/sociology/controller/CourseController.java b/src/main/java/com/peanut/modules/sociology/controller/CourseController.java index 149a5215..7cdecefe 100644 --- a/src/main/java/com/peanut/modules/sociology/controller/CourseController.java +++ b/src/main/java/com/peanut/modules/sociology/controller/CourseController.java @@ -12,6 +12,8 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + @Slf4j @RestController("sociologyCourse") @@ -22,14 +24,14 @@ public class CourseController { /** * 获取用户最近学习课程列表 - * @param param * @return */ @RequestMapping("/getUserLateCourseList") - public R getUserLateCourseList(@RequestBody ParamTo param){ + public R getUserLateCourseList(){ + ParamTo param = new ParamTo(); Integer userId = ShiroUtils.getUId(); param.setId(userId); - Page userLateCourseList = courseService.getUserLateCourseList(param); + List userLateCourseList = courseService.getUserLateCourseList(param); return R.ok().put("page",userLateCourseList); } diff --git a/src/main/java/com/peanut/modules/sociology/service/CourseService.java b/src/main/java/com/peanut/modules/sociology/service/CourseService.java index ab8f0a84..adfba43b 100644 --- a/src/main/java/com/peanut/modules/sociology/service/CourseService.java +++ b/src/main/java/com/peanut/modules/sociology/service/CourseService.java @@ -15,7 +15,7 @@ public interface CourseService extends IService { Page getSociologyCourseList(ParamTo param); - Page getUserLateCourseList(ParamTo param); + List getUserLateCourseList(ParamTo param); Page getMarketCourseList(ParamTo param); diff --git a/src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java b/src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java index 4447f5fc..b99078a2 100644 --- a/src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java +++ b/src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java @@ -61,14 +61,15 @@ public class CourseServiceImpl extends ServiceImpl impl } @Override - public Page getUserLateCourseList(ParamTo param) { + public List getUserLateCourseList(ParamTo param) { MPJLambdaWrapper wrapper = new MPJLambdaWrapper<>(); wrapper.selectAll(CourseEntity.class); wrapper.leftJoin(UserToCourseEntity.class,UserToCourseEntity::getCourseId,CourseEntity::getId); wrapper.eq(UserToCourseEntity::getUserId,param.getId()); wrapper.orderByDesc(UserToCourseEntity::getUpdateTime); - Page courseEntityPage = this.getBaseMapper().selectJoinPage(new Page<>(param.getPage(), param.getLimit()), CourseEntity.class, wrapper); - return courseEntityPage; + wrapper.last("Limit 4"); + List courseEntities = this.getBaseMapper().selectJoinList(CourseEntity.class, wrapper); + return courseEntities; } @Override From c2697e539059d427cb7c1f91318759dc303697d0 Mon Sep 17 00:00:00 2001 From: wangjinlei <751475802@qq.com> Date: Fri, 12 Apr 2024 17:27:39 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=B0=8Fbug=20=E4=BF=AE=E5=A4=8D=E5=90=8E?= =?UTF-8?q?=E5=8F=B0=E5=B7=A6=E4=BE=A7=E6=A0=8F=E7=9B=AE=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/sociology/service/impl/CourseServiceImpl.java | 1 - .../com/peanut/modules/sys/service/impl/SysMenuServiceImpl.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java b/src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java index b99078a2..3dcf430d 100644 --- a/src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java +++ b/src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java @@ -17,7 +17,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; import java.util.List; @Slf4j diff --git a/src/main/java/com/peanut/modules/sys/service/impl/SysMenuServiceImpl.java b/src/main/java/com/peanut/modules/sys/service/impl/SysMenuServiceImpl.java index 5216433b..0eabab68 100644 --- a/src/main/java/com/peanut/modules/sys/service/impl/SysMenuServiceImpl.java +++ b/src/main/java/com/peanut/modules/sys/service/impl/SysMenuServiceImpl.java @@ -79,7 +79,7 @@ public class SysMenuServiceImpl extends ServiceImpl i private List getMenuList(List menuIdList) { // 查询拥有的所有菜单 List menus = this.baseMapper.selectList(new QueryWrapper() - .in(Objects.nonNull(menuIdList), "menu_id", menuIdList).in("type", 0, 1)); + .in(Objects.nonNull(menuIdList), "menu_id", menuIdList).in("type", 0, 1).orderByAsc("order_num")); // 将id和菜单绑定 HashMap menuMap = new HashMap<>(12); for (SysMenuEntity s : menus) {