From 019526fbe921a574f76e629ad7b3079f933a630a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期日, 21 十一月 2021 01:39:43 +0800
Subject: [PATCH] update 解耦 LoginUser 与 SysUser 强关联
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
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 a0b4d3c..abc42dd 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;
@@ -48,6 +49,7 @@
/**
* 鏋勫缓 plus 鍒嗛〉瀵硅薄
+ *
* @param <T> domain 瀹炰綋
* @param <K> vo 瀹炰綋
* @return 鍒嗛〉瀵硅薄
@@ -62,16 +64,19 @@
}
PagePlus<T, K> page = new PagePlus<>(pageNum, pageSize);
OrderItem orderItem = buildOrderItem(orderByColumn, isAsc);
- page.addOrder(orderItem);
+ if (ObjectUtil.isNotNull(orderItem)) {
+ page.addOrder(orderItem);
+ }
return page;
}
- public static <T> Page<T> buildPage() {
- return buildPage(null, null);
- }
+ public static <T> Page<T> buildPage() {
+ return buildPage(null, null);
+ }
/**
* 鏋勫缓 MP 鏅�氬垎椤靛璞�
+ *
* @param <T> domain 瀹炰綋
* @return 鍒嗛〉瀵硅薄
*/
@@ -85,7 +90,9 @@
}
Page<T> page = new Page<>(pageNum, pageSize);
OrderItem orderItem = buildOrderItem(orderByColumn, isAsc);
- page.addOrder(orderItem);
+ if (ObjectUtil.isNotNull(orderItem)) {
+ page.addOrder(orderItem);
+ }
return page;
}
@@ -98,8 +105,8 @@
}
if (StringUtils.isNotBlank(orderByColumn)) {
String orderBy = SqlUtil.escapeOrderBySql(orderByColumn);
- orderBy = StringUtils.toUnderScoreCase(orderBy);
- if ("asc".equals(isAsc)) {
+ orderBy = StringUtils.toUnderScoreCase(orderBy);
+ if ("asc".equals(isAsc)) {
return OrderItem.asc(orderBy);
} else if ("desc".equals(isAsc)) {
return OrderItem.desc(orderBy);
--
Gitblit v1.9.3