From b254172b60b4ac350c22abb30c1bc520b5110e56 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期四, 29 七月 2021 17:31:18 +0800
Subject: [PATCH] 防止错误token导致的解析异常

---
 src/main/java/com/ruoyi/framework/web/page/PageDomain.java |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/ruoyi/framework/web/page/PageDomain.java b/src/main/java/com/ruoyi/framework/web/page/PageDomain.java
index 68d07b1..366f9b1 100644
--- a/src/main/java/com/ruoyi/framework/web/page/PageDomain.java
+++ b/src/main/java/com/ruoyi/framework/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