更改公告查询

purchase-admin/src/main/java/com/ozs/web/controller/base/BaseNoticeController.java

@@ -163,6 +163,7 @@ public class BaseNoticeController extends BaseController {
         pagev.setTotal(page.getTotal());
         pagev.setCurrent(page.getCurrent());
         pagev.setPages(page.getPages());
+        pagev.setSize(page.getSize());
 
         if (!ObjectUtils.isEmpty(page) && page.getRecords().size() > 0) {
             List<BaseNoticeType> list = baseNoticeTypeService.list();

purchase-system/src/main/java/com/ozs/base/mapper/BaseNoticeMapper.java

@@ -30,6 +30,6 @@ public interface BaseNoticeMapper extends BaseMapper<BaseNotice> {
             " and (#{type} is null  or   b.type = #{type})  " +
             " and (#{startTime} is null  or   to_days(b.release_time) >= to_days(#{startTime}) ) " +
             " and (#{entTime} is null  or   to_days(b.release_time) <= to_days(#{entTime}) ) " +
-            "  order by b.release_time desc")
+            " group by b.demand_id order by b.release_time desc")
     List<BaseNotice> query(BaseNoticePageReqVo vo);
 }

purchase-system/src/main/java/com/ozs/base/service/impl/BaseNoticeServiceImpl.java

@@ -35,6 +35,7 @@ public class BaseNoticeServiceImpl extends ServiceImpl<BaseNoticeMapper, BaseNot
         com.baomidou.mybatisplus.extension.plugins.pagination.Page<BaseNotice> pageR =
                 new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(pageNum, pageSize);
         pageR.setRecords(page.getResult());
+        pageR.setSize(page.size());
         pageR.setTotal(page.getTotal());
         return pageR;