Merge branch 'master' into dev
This commit is contained in:
@ -71,14 +71,13 @@ public class BizMessageConsumerServiceImpl implements BizMessageConsumerService
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private PageDTO createPageCondition(PageDTO page) {
|
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.setCurrent(Math.max(1, p.getCurrent()));
|
||||||
p.setPageNo(Math.max(1, p.getPageNo()));
|
p.setPageNo(Math.max(1, p.getPageNo()));
|
||||||
p.setPageSize(p.getPageSize() == 0 ? 15 : p.getPageSize());
|
p.setPageSize(p.getPageSize() == 0 ? 15 : p.getPageSize());
|
||||||
|
|
||||||
return p;
|
return p;
|
||||||
}).orElseGet(PageDTO::new);
|
}).orElseGet(PageDTO::new);
|
||||||
return page;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user