From 045546b340b87721a0d56580040ffdeb277db894 Mon Sep 17 00:00:00 2001
From: zhangqinbin <181961702@qq.com>
Date: Tue, 10 Aug 2021 13:56:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=9A=E5=8A=A1=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bizmessage/dao/BizMessageMapper.java      |  2 +-
 .../impl/BizMessageConsumerServiceImpl.java   | 19 +++++++++++--------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java
index ab19cc6..677fb87 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java
@@ -16,6 +16,6 @@ public interface BizMessageMapper extends BaseMapper<BizMessage> {
 
     Boolean updateState(@Param("userId") String userId,@Param("messageId") String messageId);
 
-    IPage<BizMessageVo> findMessageVoList(@Param("param") IPage<BizMessageVo> page,BizMessageVo vo);
+    List<BizMessageVo> findMessageVoList(BizMessageVo vo);
 
 }
diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageConsumerServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageConsumerServiceImpl.java
index 995be68..6eecc4c 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageConsumerServiceImpl.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageConsumerServiceImpl.java
@@ -15,6 +15,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -109,17 +110,19 @@ public class BizMessageConsumerServiceImpl implements BizMessageConsumerService
         if(vo.getAuthorizestate()==null||"".equals(vo.getAuthorizestate())){
             vo.setAuthorizestate("0");
         }
-        PageDTO page = new PageDTO();
-        page.setPageSize(vo.getSize());
 
-        IPage<BizMessageVo> pageEntity = mapper.findMessageVoList(new Page<BizMessageVo>(page.getPageNo(), page.getPageSize()),vo);
+        List<BizMessageVo> list = mapper.findMessageVoList(vo);
 
-        List<BizMessageVo> list = pageEntity.getRecords();
+        List<BizMessageVo> rList = new ArrayList<>();
 
-        list.forEach(l->{
-            l.setDatanum(pageEntity.getTotal());
-        });
+        for(int i = 0 ; i < list.size();i++){
+            if(i<vo.getSize()){
+                BizMessageVo message = list.get(i);
+                message.setDatanum(Long.valueOf(list.size()));
+                rList.add(message);
+            }
+        }
 
-        return list;
+        return rList;
     }
 }