!251 修复日志列表取消字段排序时的报错问题

Merge pull request !251 from 稚屿/N/A
2021-06-25 09:23:45 +00:00 · 2021-06-25 09:23:45 +00:00 · 751ca90690
commit 751ca90690
parent 1ed60c79c0 1dfeae6a03
1 changed files with 83 additions and 81 deletions
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java
@ -67,15 +67,17 @@ public class PageDomain

    public void setIsAsc(String isAsc)
    {
-        // 兼容前端排序类型
-        if ("ascending".equals(isAsc))
-        {
-            isAsc = "asc";
+        if (StringUtils.isNotEmpty(isAsc)) {
+            // 兼容前端排序类型
+            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;
    }
 }