From 82361e0f90dcd90523b3a3a01d3297a33a3730d4 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Fri, 22 Oct 2021 15:55:29 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B6=88=E6=81=AF=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataease/controller/sys/MsgController.java   |  3 ++-
 .../dataease/service/message/SysMsgService.java  | 16 ++++++----------
 2 files changed, 8 insertions(+), 11 deletions(-)

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<SysMsgType> sysMsgTypes = sysMsgService.queryMsgTypes();
             typeIds = sysMsgTypes.stream().filter(sysMsgType -> msgRequest.getType() == sysMsgType.getPid()).map(SysMsgType::getMsgTypeId).collect(Collectors.toList());
         }
+        Long overTime = sysMsgService.overTime();
         Page<Object> page = PageHelper.startPage(goPage, pageSize, true);
-        Pager<List<MsgGridDto>> listPager = PageUtils.setPageInfo(page, sysMsgService.queryGrid(userId, msgRequest, typeIds));
+        Pager<List<MsgGridDto>> 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<SysMsg> query(Long userId, MsgRequest msgRequest) {
+    /* public List<SysMsg> 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<SysMsg> sysMsgs = sysMsgMapper.selectByExample(example);
         return sysMsgs;
     }
-
-    public List<MsgGridDto> queryGrid(Long userId, MsgRequest msgRequest, List<Long> typeIds) {
+ */
+    public List<MsgGridDto> queryGrid(Long userId, MsgRequest msgRequest, List<Long> 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<MsgGridDto> msgGridDtos = extSysMsgMapper.queryGrid(example);
@@ -349,11 +350,6 @@ public class SysMsgService {
                  
     }
 
-    /* public static void main(String[] args) {
-        
-        Long overTime = overTime();
-        System.out.println(overTime);
-        
-    } */
+    
 
 }