首页新闻通知等

yudao-server/src/main/java/cn/iocoder/yudao/server/controller/admin/HomeController.java

@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.server.controller.admin;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.server.dal.dataobject.OaDocDO;
 import cn.iocoder.yudao.server.dal.mysql.OaMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -29,25 +30,28 @@ public class HomeController {
 
     @GetMapping("/red")
     @PermitAll
-    public CommonResult<IPage<OaDocDO>> redFile(Integer pageNo,Integer pageSize) {
+    public CommonResult<PageResult<OaDocDO>> redFile(Integer pageNo,Integer pageSize) {
         Page<OaDocDO> page = new Page<>(pageNo, pageSize);
         IPage<OaDocDO> oaDocDOIPage = oaMapper.selectOaDocPage(page, ImmutableList.of(28, 143));
-        return CommonResult.success(oaDocDOIPage);
+        PageResult<OaDocDO> result = new PageResult<>(oaDocDOIPage.getRecords(), oaDocDOIPage.getTotal());
+        return CommonResult.success(result);
     }
 
     @GetMapping("/notice")
     @PermitAll
-    public CommonResult<IPage<OaDocDO>> noticeFile(Integer pageNo,Integer pageSize) {
+    public CommonResult<PageResult<OaDocDO>> noticeFile(Integer pageNo,Integer pageSize) {
         Page<OaDocDO> page = new Page<>(pageNo, pageSize);
         IPage<OaDocDO> oaDocDOIPage = oaMapper.selectOaDocPage(page, ImmutableList.of(25));
-        return CommonResult.success(oaDocDOIPage);
+        PageResult<OaDocDO> result = new PageResult<>(oaDocDOIPage.getRecords(), oaDocDOIPage.getTotal());
+        return CommonResult.success(result);
     }
 
     @GetMapping("/news")
     @PermitAll
-    public CommonResult<IPage<OaDocDO>> newsFile(Integer pageNo,Integer pageSize) {
+    public CommonResult<PageResult<OaDocDO>> newsFile(Integer pageNo,Integer pageSize) {
         Page<OaDocDO> page = new Page<>(pageNo, pageSize);
         IPage<OaDocDO> oaDocDOIPage = oaMapper.selectOaDocPage(page, ImmutableList.of(14));
-        return CommonResult.success(oaDocDOIPage);
+        PageResult<OaDocDO> result = new PageResult<>(oaDocDOIPage.getRecords(), oaDocDOIPage.getTotal());
+        return CommonResult.success(result);
     }
 }

yudao-server/src/main/java/cn/iocoder/yudao/server/dal/mysql/OaMapper.java

@@ -31,7 +31,7 @@ default IPage<OaDocDO> selectOaDocPage(Page<OaDocDO> page, List<Integer> params)
             new LambdaQueryWrapper<OaDocDO>()
                     .in(OaDocDO::getSeccategory, params)
                     .in(OaDocDO::getDocstatus, 1, 2)
-                    .orderByDesc(OaDocDO::getDocstatus)
+                    .orderByDesc(OaDocDO::getDocvaliddate)
     );
 }
 }