From 570ec71fb19fb1c6a51527d9bc503361c66809c2 Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Wed, 5 Aug 2020 11:19:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/CustomerServiceImpl.java | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java
index 4e944f2920..c666fde165 100644
--- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java
@@ -44,6 +44,7 @@ import com.epmet.feign.OperCustomizeFeignClient;
 import com.epmet.redis.CustomerRedis;
 import com.epmet.service.CustomerService;
 import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -400,12 +401,12 @@ public class CustomerServiceImpl extends BaseServiceImpl<CustomerDao, CustomerEn
     @Override
     public PageData pageQuery(PageQueryFormDTO formDTO) {
         //1:查询有效客户数据(不区分是否在有效期内)
-        PageHelper.startPage(formDTO.getPageNo(),formDTO.getPageSize());
-        List<CustomerResultDTO> list = baseDao.selectCustomerList(formDTO.getCustomerName());
-        //PageInfo<CustomerResultDTO> pi = new PageInfo<>(list);
-        int total=baseDao.selectCountByCustomerName(formDTO.getCustomerName());
-        PageData resultDTO = new PageData(list,total);
-        return resultDTO;
+        PageInfo<CustomerResultDTO> pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize())
+                .doSelectPageInfo(() -> baseDao.selectCustomerList(formDTO.getCustomerName()));
+//        List<CustomerResultDTO> list = baseDao.selectCustomerList(formDTO.getCustomerName());
+//        //PageInfo<CustomerResultDTO> pi = new PageInfo<>(list);
+//        int total=baseDao.selectCountByCustomerName(formDTO.getCustomerName());
+        return new PageData(pageInfo.getList(),pageInfo.getTotal());
     }
 
     /**