diff --git a/src/main/java/com/peanut/modules/common/entity/CourseCatalogueChapterEntity.java b/src/main/java/com/peanut/modules/common/entity/CourseCatalogueChapterEntity.java index 57d58fc5..da0cfeae 100644 --- a/src/main/java/com/peanut/modules/common/entity/CourseCatalogueChapterEntity.java +++ b/src/main/java/com/peanut/modules/common/entity/CourseCatalogueChapterEntity.java @@ -21,6 +21,8 @@ public class CourseCatalogueChapterEntity { private String imgUrl; + private Integer isAudition; + private String content; private Integer sort; 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 13cdf3bf..30453596 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 @@ -1,6 +1,7 @@ package com.peanut.modules.sociology.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.enums.SqlKeyword; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.yulichang.wrapper.MPJLambdaWrapper; @@ -69,6 +70,7 @@ public class CourseServiceImpl extends ServiceImpl impl wrapper.leftJoin(UserToCourseEntity.class,UserToCourseEntity::getCourseId,CourseEntity::getId); wrapper.eq(UserToCourseEntity::getUserId,param.getId()); wrapper.orderByDesc(UserToCourseEntity::getUpdateTime); + wrapper.exists("select * from course_to_sociology where course_id = t.id"); wrapper.last("Limit 4"); List courseEntities = this.getBaseMapper().selectJoinList(CourseEntity.class, wrapper); return courseEntities; diff --git a/src/main/java/com/peanut/modules/sys/controller/SysMenuController.java b/src/main/java/com/peanut/modules/sys/controller/SysMenuController.java index dc40f748..c7e15495 100644 --- a/src/main/java/com/peanut/modules/sys/controller/SysMenuController.java +++ b/src/main/java/com/peanut/modules/sys/controller/SysMenuController.java @@ -8,6 +8,7 @@ package com.peanut.modules.sys.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.peanut.common.annotation.SysLog; import com.peanut.common.exception.RRException; import com.peanut.common.utils.Constant; @@ -56,7 +57,8 @@ public class SysMenuController extends AbstractController { @GetMapping("/list") @RequiresPermissions("sys:menu:list") public List list(){ - List menuList = sysMenuService.list(); + List menuList = sysMenuService.getBaseMapper().selectList(new LambdaQueryWrapper().orderByAsc(SysMenuEntity::getOrderNum)); +// List menuList = sysMenuService.list(); HashMap menuMap = new HashMap<>(12); for (SysMenuEntity s : menuList) { menuMap.put(s.getMenuId(), s);