diff --git a/ruoyi-system/src/main/java/com/ruoyi/official/service/impl/GwSlideshowServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/official/service/impl/GwSlideshowServiceImpl.java index 8757093..8f439e3 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/official/service/impl/GwSlideshowServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/official/service/impl/GwSlideshowServiceImpl.java @@ -70,6 +70,13 @@ public class GwSlideshowServiceImpl implements IGwSlideshowService { public TableDataInfo queryPageList(GwSlideshowBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + if (CollUtil.isNotEmpty(result.getRecords())){ + List records = result.getRecords(); + List collect = records.stream().filter(ObjectUtil::isNotEmpty).sorted(Comparator.comparing(GwSlideshowVo::getReleaseTime).reversed()).collect(Collectors.toList()); + List fist = collect.stream().filter(itx -> itx.getIsTop().equals("1")).collect(Collectors.toList()); + fist.addAll(collect.stream().filter(itx->!itx.getIsTop().equals("1")).collect(Collectors.toList())); + result.setRecords(fist); + } return TableDataInfo.build(result); }