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 list = baseDao.selectCustomerList(formDTO.getCustomerName()); - //PageInfo pi = new PageInfo<>(list); - int total=baseDao.selectCountByCustomerName(formDTO.getCustomerName()); - PageData resultDTO = new PageData(list,total); - return resultDTO; + PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()) + .doSelectPageInfo(() -> baseDao.selectCustomerList(formDTO.getCustomerName())); +// List list = baseDao.selectCustomerList(formDTO.getCustomerName()); +// //PageInfo pi = new PageInfo<>(list); +// int total=baseDao.selectCountByCustomerName(formDTO.getCustomerName()); + return new PageData(pageInfo.getList(),pageInfo.getTotal()); } /**