From 46614cb8c1183379694f807c872b6e6bcac932b6 Mon Sep 17 00:00:00 2001
From: ajaxfan <909938737@qq.com>
Date: Sat, 6 Mar 2021 09:41:43 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=B6=88=E6=81=AF=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mall/ebtp/extend/bizmessage/dto/PageDTO.java       | 10 ++++++++--
 .../service/impl/BizMessageConsumerServiceImpl.java    |  3 +--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dto/PageDTO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dto/PageDTO.java
index b22ef55..023f147 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dto/PageDTO.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dto/PageDTO.java
@@ -13,11 +13,17 @@ public class PageDTO {
 
 	@ApiModelProperty(required = false, value = "当前页（默认1）")
 	private int current;
-	
+
 	@ApiModelProperty(required = false, value = "页码（默认1）")
 	private int pageNo;
-	
+
 	@ApiModelProperty(required = false, value = "单页数量（默认15）")
 	private int pageSize;
 
+	public PageDTO() {
+		this.current = 1;
+		this.pageNo = 1;
+		this.pageSize = 15;
+	}
+
 }
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 bb99c71..7d1711b 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
@@ -69,14 +69,13 @@ public class BizMessageConsumerServiceImpl implements BizMessageConsumerService
 	 * @return
 	 */
 	private PageDTO createPageCondition(PageDTO page) {
-		page = Optional.ofNullable(page).map(p -> {
+		return Optional.ofNullable(page).map(p -> {
 			p.setCurrent(Math.max(1, p.getCurrent()));
 			p.setPageNo(Math.max(1, p.getPageNo()));
 			p.setPageSize(p.getPageSize() == 0 ? 15 : p.getPageSize());
 
 			return p;
 		}).orElseGet(PageDTO::new);
-		return page;
 	}
 
 }