From bc182f1392c1899bf66f308d3587455ef1034b2e Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 28 四月 2021 11:52:21 +0800
Subject: [PATCH] fix 日志时间问题
---
ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java | 55 +++++++++++--------------------------------------------
1 files changed, 11 insertions(+), 44 deletions(-)
diff --git 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
index 26a069c..2fc6b87 100644
--- 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
@@ -1,12 +1,18 @@
package com.ruoyi.common.core.page;
-import com.ruoyi.common.utils.StringUtils;
+import cn.hutool.core.util.StrUtil;
+import lombok.*;
+import lombok.experimental.Accessors;
/**
* 鍒嗛〉鏁版嵁
*
* @author ruoyi
*/
+
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
public class PageDomain
{
/** 褰撳墠璁板綍璧峰绱㈠紩 */
@@ -18,55 +24,16 @@
/** 鎺掑簭鍒� */
private String orderByColumn;
- /** 鎺掑簭鐨勬柟鍚� "desc" 鎴栬�� "asc". */
- private String isAsc;
+ /** 鎺掑簭鐨勬柟鍚慸esc鎴栬�卆sc */
+ private String isAsc = "asc";
public String getOrderBy()
{
- if (StringUtils.isEmpty(orderByColumn))
+ if (StrUtil.isEmpty(orderByColumn))
{
return "";
}
- return StringUtils.toUnderScoreCase(orderByColumn) + " " + isAsc;
+ return StrUtil.toUnderlineCase(orderByColumn) + " " + isAsc;
}
- public Integer getPageNum()
- {
- return pageNum;
- }
-
- public void setPageNum(Integer pageNum)
- {
- this.pageNum = pageNum;
- }
-
- public Integer getPageSize()
- {
- return pageSize;
- }
-
- public void setPageSize(Integer pageSize)
- {
- this.pageSize = pageSize;
- }
-
- public String getOrderByColumn()
- {
- return orderByColumn;
- }
-
- public void setOrderByColumn(String orderByColumn)
- {
- this.orderByColumn = orderByColumn;
- }
-
- public String getIsAsc()
- {
- return isAsc;
- }
-
- public void setIsAsc(String isAsc)
- {
- this.isAsc = isAsc;
- }
}
--
Gitblit v1.9.3