|
@@ -98,11 +98,8 @@ public class MsgWebPushServiceImpl extends ServiceImpl<MsgWebPushMapper, MsgWebP
|
|
|
.doSelectPage(() -> msgWebPushMapper.messageMore(msgAlarmVo));
|
|
|
com.baomidou.mybatisplus.extension.plugins.pagination.Page<MsgAlarm> pageR =
|
|
|
new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(msgAlarmVo.getPageNum().intValue(), msgAlarmVo.getPageSize().intValue());
|
|
|
-
|
|
|
pageR.setSize(page.size());
|
|
|
pageR.setTotal(page.getTotal());
|
|
|
-
|
|
|
-
|
|
|
// Page<MsgAlarm> page = PageUtils.getPages(msgAlarmVo.getPageNum().intValue(), msgAlarmVo.getPageSize().intValue(), webAlarm);
|
|
|
if (!ObjectUtils.isEmpty(page) && !ObjectUtils.isEmpty(page.getResult())) {
|
|
|
List<MsgAlarm> dto1 = page.getResult().stream().map(o -> {
|