|
|
@ -27,9 +27,7 @@ public class MyBatisUtils { |
|
|
|
Page<T> page = new Page<>(pageParam.getPageNo(), pageParam.getPageSize()); |
|
|
|
// 排序字段
|
|
|
|
if (!CollectionUtils.isAnyEmpty(pageParam.getSorts())) { |
|
|
|
pageParam.getSorts().stream().iterator().forEachRemaining(p -> { |
|
|
|
page.addOrder(PageParam.ORDER_ASC.equals(p.getBy()) ? OrderItem.asc(p.getSort()) : OrderItem.desc(p.getSort())); |
|
|
|
}); |
|
|
|
pageParam.getSorts().stream().iterator().forEachRemaining(order -> page.addOrder(PageParam.ORDER_ASC.equals(order.getBy()) ? OrderItem.asc(order.getSort()) : OrderItem.desc(order.getSort()))); |
|
|
|
} else if (!StringUtils.isEmpty(pageParam.getBy()) && !StringUtils.isEmpty(pageParam.getSort())) { |
|
|
|
page.addOrder(PageParam.ORDER_ASC.equals(pageParam.getBy()) ? OrderItem.asc(pageParam.getSort()) : OrderItem.desc(pageParam.getSort())); |
|
|
|
} else { |
|
|
|