diff --git a/backend/src/main/java/io/dataease/controller/sys/MsgController.java b/backend/src/main/java/io/dataease/controller/sys/MsgController.java index b100aea861..8db6b4cba9 100644 --- a/backend/src/main/java/io/dataease/controller/sys/MsgController.java +++ b/backend/src/main/java/io/dataease/controller/sys/MsgController.java @@ -42,8 +42,9 @@ public class MsgController { List sysMsgTypes = sysMsgService.queryMsgTypes(); typeIds = sysMsgTypes.stream().filter(sysMsgType -> msgRequest.getType() == sysMsgType.getPid()).map(SysMsgType::getMsgTypeId).collect(Collectors.toList()); } + Long overTime = sysMsgService.overTime(); Page page = PageHelper.startPage(goPage, pageSize, true); - Pager> listPager = PageUtils.setPageInfo(page, sysMsgService.queryGrid(userId, msgRequest, typeIds)); + Pager> listPager = PageUtils.setPageInfo(page, sysMsgService.queryGrid(userId, msgRequest, typeIds, overTime)); return listPager; } diff --git a/backend/src/main/java/io/dataease/service/message/SysMsgService.java b/backend/src/main/java/io/dataease/service/message/SysMsgService.java index a15cf4101f..8766d60b57 100644 --- a/backend/src/main/java/io/dataease/service/message/SysMsgService.java +++ b/backend/src/main/java/io/dataease/service/message/SysMsgService.java @@ -55,7 +55,7 @@ public class SysMsgService { @Autowired private SystemParameterService systemParameterService; - public List query(Long userId, MsgRequest msgRequest) { + /* public List query(Long userId, MsgRequest msgRequest) { String orderClause = " create_time desc"; SysMsgExample example = new SysMsgExample(); SysMsgExample.Criteria criteria = example.createCriteria(); @@ -81,8 +81,8 @@ public class SysMsgService { List sysMsgs = sysMsgMapper.selectByExample(example); return sysMsgs; } - - public List queryGrid(Long userId, MsgRequest msgRequest, List typeIds) { + */ + public List queryGrid(Long userId, MsgRequest msgRequest, List typeIds, Long startTime) { String orderClause = " create_time desc"; SysMsgExample example = new SysMsgExample(); SysMsgExample.Criteria criteria = example.createCriteria(); @@ -110,7 +110,8 @@ public class SysMsgService { criteria.andStatusEqualTo(msgRequest.getStatus()); } - criteria.andCreateTimeGreaterThanOrEqualTo(overTime()); + criteria.andCreateTimeGreaterThanOrEqualTo(startTime); + /* criteria.andCreateTimeGreaterThanOrEqualTo(overTime()); */ example.setOrderByClause(orderClause); List msgGridDtos = extSysMsgMapper.queryGrid(example); @@ -349,11 +350,6 @@ public class SysMsgService { } - /* public static void main(String[] args) { - - Long overTime = overTime(); - System.out.println(overTime); - - } */ + }