diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/home/ColumnTreeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/home/ColumnTreeController.java index 2267e6e..6e33409 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/home/ColumnTreeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/home/ColumnTreeController.java @@ -73,7 +73,7 @@ public class ColumnTreeController extends BaseController { LambdaQueryWrapper tagWrapper = new LambdaQueryWrapper<>(); tagWrapper.eq(SysColumn::getColumnId, columnId) .eq(SysColumn::getColumnGrade, COLUMN_GRADE) - .eq(SysColumn::getStatus,STATUS) + .eq(SysColumn::getStatus, STATUS) .orderByAsc(SysColumn::getOrderNum); List datas = columnService.list(tagWrapper); List tagTreeVOList = new ArrayList<>(Convert.toList(SysColumnVO.class, datas)); @@ -113,21 +113,21 @@ public class ColumnTreeController extends BaseController { @ApiOperation("获取专题栏目") @GetMapping("/getSpecial") - public R> getSpecial(@RequestParam(required = false) String id, - @RequestParam(required = false) String columnId) { + public R> getSpecial(@RequestParam(required = false) String columnId, + @RequestParam(required = false, defaultValue = "1") String type) { List sysSpecialVos = new ArrayList<>(); LambdaQueryWrapper columnQueryWrapper = new LambdaQueryWrapper<>(); columnQueryWrapper.eq(SysColumn::getStatus, STATUS); - if(StringUtils.isNotEmpty(columnId)){ + if(Objects.equals(type, COLUMN_GRADE)){ columnQueryWrapper.eq(SysColumn::getColumnId, columnId); }else{ - columnQueryWrapper.eq(SysColumn::getParentId, id); + columnQueryWrapper.eq(SysColumn::getParentId, columnId); } columnQueryWrapper.orderByAsc(SysColumn::getOrderNum); List columns = columnService.list(columnQueryWrapper); - if (columns.isEmpty() && Objects.isNull(columnId)) { + if (columns.isEmpty() && !Objects.equals(type, COLUMN_GRADE)) { columnQueryWrapper.clear(); - columnQueryWrapper.eq(SysColumn::getColumnId, id) + columnQueryWrapper.eq(SysColumn::getColumnId, columnId) .eq(SysColumn::getStatus, STATUS) .orderByAsc(SysColumn::getOrderNum); columns = columnService.list(columnQueryWrapper); @@ -141,10 +141,9 @@ public class ColumnTreeController extends BaseController { .eq(SysSpecial::getStatus, STATUS) .orderByDesc(SysSpecial::getCreateTime) .list(); - sysSpecialVo.setSysSpecials(specialList); + sysSpecialVo.setSysSpecials(PageInfo.of(specialList)); sysSpecialVos.add(sysSpecialVo); }); - PageInfo page = PageInfo.of(sysSpecialVos); - return R.ok(page); + return R.ok(sysSpecialVos); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/home/HomeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/home/HomeController.java index e19333b..f071e80 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/home/HomeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/home/HomeController.java @@ -297,19 +297,7 @@ public class HomeController { @ApiOperation("专题活动") @GetMapping("/special_view.html") public String special(ModelMap mmap, - @RequestParam(required = false, defaultValue = "1", value = "p") Integer pageNum, - @RequestParam(required = false ,defaultValue = PAGE_SIZE, value = "ps") Integer pageSize, - @RequestParam(required = false ) String columnId - ) { - PageMethod.startPage(pageNum,pageSize); - //专题活动 - SysSpecial sysSpecial = new SysSpecial(); - sysSpecial.setStatus(STATUS); - sysSpecial.setColumnId(columnId); - List specialList = specialService.selectSysSpecialList(sysSpecial); - PageInfo page = new PageInfo<>(specialList, pageSize); - mmap.put("page", page); - mmap.put("pageUrl", "/special_view.html"); + String columnId) { mmap.put("columnId", columnId); return "home/special_view"; } diff --git a/ruoyi-admin/src/main/resources/templates/home/special_list.html b/ruoyi-admin/src/main/resources/templates/home/special_list.html index 31307ef..06a8ea9 100644 --- a/ruoyi-admin/src/main/resources/templates/home/special_list.html +++ b/ruoyi-admin/src/main/resources/templates/home/special_list.html @@ -219,7 +219,7 @@

当前位置:首页 / 专题活动

+ href="special_list.html" target="_parent">专题活动



diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysSpecialVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysSpecialVo.java index 7b6ded8..7eba7d8 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysSpecialVo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysSpecialVo.java @@ -1,5 +1,6 @@ package com.ruoyi.system.domain; +import com.github.pagehelper.PageInfo; import lombok.Data; import java.io.Serializable; import java.util.List; @@ -20,7 +21,7 @@ public class SysSpecialVo implements Serializable { private String columnName; - private List sysSpecials ; + private PageInfo sysSpecials ;