Commit 6b2c7353 authored by liqin's avatar liqin 💬

bug fixed

parent a33ba06b
......@@ -111,7 +111,7 @@ public class ExhibitionBoardCatController extends BaseController {
@GetMapping("/getList")
@RequiresAuthentication //@RequiresPermissions("exhibition:board:cat:list")
@ApiOperation(value = "获取展板分类全部列表(无分页)", notes = "获取展板分类全部列表(无分页)")
public Map<String, Object> getExhibitionBoardCatList(@RequestParam(value = "auditStatus", required = false) AuditStatusEnum auditStatus) {
public Map<String, Object> getExhibitionBoardCatList() {
List<ExhibitionBoardCat> exhibitionBoardCatList = exhibitionBoardCatService.list(Wrappers.<ExhibitionBoardCat>lambdaQuery().orderByDesc(ExhibitionBoardCat::getCreateTime));
return getResult(exhibitionBoardCatList);
}
......
......@@ -229,8 +229,7 @@ public class LearningContentController extends BaseController {
if (StringUtils.isNotBlank(learningProjectId)) {
queryWrapper.eq(LearningContent::getLearningProjectId, learningProjectId);
}
// 根据创建时间区间检索
if (genericPageParam.getIsPublished() != null) {
if (genericPageParam.getIsPublished()) {
queryWrapper.eq(LearningContent::getPublished, genericPageParam.getIsPublished());
}
// 对名称或编码模糊查询
......@@ -248,8 +247,11 @@ public class LearningContentController extends BaseController {
queryWrapper.select(
LearningContent::getId,
LearningContent::getName,
LearningContent::getApplicableScope,
LearningContent::getAuditStatus,
LearningContent::getPublished,
LearningContent::getDeleted,
LearningContent::getSortorder,
LearningContent::getCreateTime,
LearningContent::getUpdateTime);
Page<LearningContent> page = this.learningContentService.page(getPage(), queryWrapper);
......
......@@ -80,8 +80,6 @@ public class VideoContentCatController extends BaseController {
@RequiresAuthentication //@RequiresPermissions("video:content:cat:list")
@ApiOperation(value = "获取视频内容分类全部列表(无分页)", notes = "获取视频内容分类全部列表(无分页)")
public Map<String, Object> getVideoContentCatList() {
LambdaQueryWrapper<VideoContentCat> queryWrapper = new LambdaQueryWrapper<>();
// 设置排序规则
List<VideoContentCat> videoContentCatList = videoContentCatService.list(Wrappers.<VideoContentCat>lambdaQuery().orderByDesc(VideoContentCat::getCreateTime));
return getResult(videoContentCatList);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment