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