|
@@ -2,6 +2,7 @@ package cn.reghao.devops.web.admin.sys.controller.page;
|
|
|
|
|
|
|
|
import cn.reghao.devops.web.admin.sys.model.po.SysMessage;
|
|
import cn.reghao.devops.web.admin.sys.model.po.SysMessage;
|
|
|
import cn.reghao.devops.web.admin.sys.db.repository.SysMessageRepository;
|
|
import cn.reghao.devops.web.admin.sys.db.repository.SysMessageRepository;
|
|
|
|
|
+import cn.reghao.devops.web.admin.sys.model.vo.SysMsg;
|
|
|
import io.swagger.annotations.Api;
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
import org.springframework.data.domain.Page;
|
|
import org.springframework.data.domain.Page;
|
|
@@ -33,8 +34,7 @@ public class SysMessagePageController {
|
|
|
@GetMapping("")
|
|
@GetMapping("")
|
|
|
public String messagePage(Model model) {
|
|
public String messagePage(Model model) {
|
|
|
PageRequest pageRequest = PageRequest.of(0, 10, Sort.by(Sort.Direction.DESC, "createTime"));
|
|
PageRequest pageRequest = PageRequest.of(0, 10, Sort.by(Sort.Direction.DESC, "createTime"));
|
|
|
- Page<SysMessage> page = sysMessageRepository.findByUnreadIsTrue(pageRequest);
|
|
|
|
|
- model.addAttribute("page", page);
|
|
|
|
|
|
|
+ Page<SysMsg> page = sysMessageRepository.findByUnreadIsTrue(pageRequest).map(SysMsg::new);
|
|
|
model.addAttribute("list", page.getContent());
|
|
model.addAttribute("list", page.getContent());
|
|
|
return "/admin/msg/sysmsg";
|
|
return "/admin/msg/sysmsg";
|
|
|
}
|
|
}
|