Sfoglia il codice sorgente

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

RuoYi 4 anni fa
parent
commit
6146d63f2c

+ 11 - 8
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/PageDomain.java

@@ -67,15 +67,18 @@ public class PageDomain
67 67
 
68 68
     public void setIsAsc(String isAsc)
69 69
     {
70
-        // 兼容前端排序类型
71
-        if ("ascending".equals(isAsc))
70
+        if (StringUtils.isNotEmpty(isAsc))
72 71
         {
73
-            isAsc = "asc";
72
+            // 兼容前端排序类型
73
+            if ("ascending".equals(isAsc))
74
+            {
75
+                isAsc = "asc";
76
+            }
77
+            else if ("descending".equals(isAsc))
78
+            {
79
+                isAsc = "desc";
80
+            }
81
+            this.isAsc = isAsc;
74 82
         }
75
-        else if ("descending".equals(isAsc))
76
-        {
77
-            isAsc = "desc";
78
-        }
79
-        this.isAsc = isAsc;
80 83
     }
81 84
 }