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; } }