admin/lx-admin-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 分页工具 排序字段 null 处理

Browse Source
This commit is contained in:
疯狂的狮子li 2021-11-11 12:47:26 +08:00
parent d2ec3e7d9a
commit 223ff4ebff
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java
View File

@ -1,5 +1,6 @@
package com.ruoyi.common.utils; package com.ruoyi.common.utils;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.http.HttpStatus; import cn.hutool.http.HttpStatus;
import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@ -63,7 +64,9 @@ public class PageUtils {
} }
PagePlus<T, K> page = new PagePlus<>(pageNum, pageSize); PagePlus<T, K> page = new PagePlus<>(pageNum, pageSize);
OrderItem orderItem = buildOrderItem(orderByColumn, isAsc); OrderItem orderItem = buildOrderItem(orderByColumn, isAsc);
page.addOrder(orderItem); if (ObjectUtil.isNotNull(orderItem)) {
page.addOrder(orderItem);
}
return page; return page;
} }
@ -87,7 +90,9 @@ public class PageUtils {
} }
Page<T> page = new Page<>(pageNum, pageSize); Page<T> page = new Page<>(pageNum, pageSize);
OrderItem orderItem = buildOrderItem(orderByColumn, isAsc); OrderItem orderItem = buildOrderItem(orderByColumn, isAsc);
page.addOrder(orderItem); if (ObjectUtil.isNotNull(orderItem)) {
page.addOrder(orderItem);
}
return page; return page;
} }