Merge branch 'master' into dev

This commit is contained in:
付庆吉
2021-03-12 09:14:09 +08:00

View File

@ -71,14 +71,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;
}
}