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

Merge pull request !251 from 稚屿/N/A

ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java

@@ -1,81 +1,83 @@
-package com.ruoyi.common.core.page;
+package com.ruoyi.common.core.page;
-
+
-import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.StringUtils;
-
+
-/**
+/**
- * 分页数据
+ * 分页数据
- * 
+ * 
- * @author ruoyi
+ * @author ruoyi
- */
+ */
-public class PageDomain
+public class PageDomain
-{
+{
-    /** 当前记录起始索引 */
+    /** 当前记录起始索引 */
-    private Integer pageNum;
+    private Integer pageNum;
-
+
-    /** 每页显示记录数 */
+    /** 每页显示记录数 */
-    private Integer pageSize;
+    private Integer pageSize;
-
+
-    /** 排序列 */
+    /** 排序列 */
-    private String orderByColumn;
+    private String orderByColumn;
-
+
-    /** 排序的方向desc或者asc */
+    /** 排序的方向desc或者asc */
-    private String isAsc = "asc";
+    private String isAsc = "asc";
-
+
-    public String getOrderBy()
+    public String getOrderBy()
-    {
+    {
-        if (StringUtils.isEmpty(orderByColumn))
+        if (StringUtils.isEmpty(orderByColumn))
-        {
+        {
-            return "";
+            return "";
-        }
+        }
-        return StringUtils.toUnderScoreCase(orderByColumn) + " " + isAsc;
+        return StringUtils.toUnderScoreCase(orderByColumn) + " " + isAsc;
-    }
+    }
-
+
-    public Integer getPageNum()
+    public Integer getPageNum()
-    {
+    {
-        return pageNum;
+        return pageNum;
-    }
+    }
-
+
-    public void setPageNum(Integer pageNum)
+    public void setPageNum(Integer pageNum)
-    {
+    {
-        this.pageNum = pageNum;
+        this.pageNum = pageNum;
-    }
+    }
-
+
-    public Integer getPageSize()
+    public Integer getPageSize()
-    {
+    {
-        return pageSize;
+        return pageSize;
-    }
+    }
-
+
-    public void setPageSize(Integer pageSize)
+    public void setPageSize(Integer pageSize)
-    {
+    {
-        this.pageSize = pageSize;
+        this.pageSize = pageSize;
-    }
+    }
-
+
-    public String getOrderByColumn()
+    public String getOrderByColumn()
-    {
+    {
-        return orderByColumn;
+        return orderByColumn;
-    }
+    }
-
+
-    public void setOrderByColumn(String orderByColumn)
+    public void setOrderByColumn(String orderByColumn)
-    {
+    {
-        this.orderByColumn = orderByColumn;
+        this.orderByColumn = orderByColumn;
-    }
+    }
-
+
-    public String getIsAsc()
+    public String getIsAsc()
-    {
+    {
-        return isAsc;
+        return isAsc;
-    }
+    }
-
+
-    public void setIsAsc(String isAsc)
+    public void setIsAsc(String isAsc)
-    {
+    {
-        // 兼容前端排序类型
+        if (StringUtils.isNotEmpty(isAsc)) {
-        if ("ascending".equals(isAsc))
+            // 兼容前端排序类型
-        {
+            if ("ascending".equals(isAsc))
-            isAsc = "asc";
+            {
-        }
+                isAsc = "asc";
-        else if ("descending".equals(isAsc))
+            }
-        {
+            else if ("descending".equals(isAsc))
-            isAsc = "desc";
+            {
-        }
+                isAsc = "desc";
-        this.isAsc = isAsc;
+            }
-    }
+            this.isAsc = isAsc;
-}
+        }
+    }
+}