Browse Source

HL-5992 成都PDA端正式环境《零件查询》功能,主列表按零件查询后的数据与筛选中按库位查询的结果不一致,同时在列表中增加按库位排序 > 增加多排序 sorts[{},{}]

hella_online_20240913_2
李达明 1 week ago
parent
commit
044c1ac95b
  1. 4
      win-framework/win-spring-boot-starter-mybatis/src/main/java/com/win/framework/mybatis/core/util/MyBatisUtils.java

4
win-framework/win-spring-boot-starter-mybatis/src/main/java/com/win/framework/mybatis/core/util/MyBatisUtils.java

@ -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 {

Loading…
Cancel
Save