From 8b23c97fdb15cd2f49c33ac4b9c5f5d367f24593 Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: Sat, 17 Jul 2021 16:48:40 +0800
Subject: [PATCH] !83 【轻量级PR】RuoYiFileApplication 重命名为RuoYiFileApplication Merge pull request !83 from dazer007/RuoYFileApplication-rename-
---
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/PageDomain.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/PageDomain.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/PageDomain.java
index e681c67..e97b4e5 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/PageDomain.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/PageDomain.java
@@ -67,15 +67,18 @@
public void setIsAsc(String isAsc)
{
- // 兼容前端排序类型
- if ("ascending".equals(isAsc))
+ if (StringUtils.isNotEmpty(isAsc))
{
- isAsc = "asc";
+ // 兼容前端排序类型
+ if ("ascending".equals(isAsc))
+ {
+ isAsc = "asc";
+ }
+ else if ("descending".equals(isAsc))
+ {
+ isAsc = "desc";
+ }
+ this.isAsc = isAsc;
}
- else if ("descending".equals(isAsc))
- {
- isAsc = "desc";
- }
- this.isAsc = isAsc;
}
}
--
Gitblit v1.9.3