Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
jinli gu
RuoYi Vue
Commits
1dfeae6a
Commit
1dfeae6a
authored
Jun 24, 2021
by
稚屿
Committed by
Gitee
Jun 24, 2021
Browse files
修复日志列表取消字段排序时的报错问题
parent
1ed60c79
Changes
1
Hide whitespace changes
Inline
Side-by-side
ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java
View file @
1dfeae6a
package
com.ruoyi.common.core.page
;
import
com.ruoyi.common.utils.StringUtils
;
/**
* 分页数据
*
* @author ruoyi
*/
public
class
PageDomain
{
/** 当前记录起始索引 */
private
Integer
pageNum
;
/** 每页显示记录数 */
private
Integer
pageSize
;
/** 排序列 */
private
String
orderByColumn
;
/** 排序的方向desc或者asc */
private
String
isAsc
=
"asc"
;
public
String
getOrderBy
()
{
if
(
StringUtils
.
isEmpty
(
orderByColumn
))
{
return
""
;
}
return
StringUtils
.
toUnderScoreCase
(
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
)
{
// 兼容前端排序类型
if
(
"ascending"
.
equals
(
isAsc
))
{
isAsc
=
"asc"
;
}
else
if
(
"descending"
.
equals
(
isAsc
))
{
isAsc
=
"desc"
;
}
this
.
isAsc
=
isAsc
;
}
}
package
com.ruoyi.common.core.page
;
import
com.ruoyi.common.utils.StringUtils
;
/**
* 分页数据
*
* @author ruoyi
*/
public
class
PageDomain
{
/** 当前记录起始索引 */
private
Integer
pageNum
;
/** 每页显示记录数 */
private
Integer
pageSize
;
/** 排序列 */
private
String
orderByColumn
;
/** 排序的方向desc或者asc */
private
String
isAsc
=
"asc"
;
public
String
getOrderBy
()
{
if
(
StringUtils
.
isEmpty
(
orderByColumn
))
{
return
""
;
}
return
StringUtils
.
toUnderScoreCase
(
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
)
{
if
(
StringUtils
.
isNotEmpty
(
isAsc
))
{
// 兼容前端排序类型
if
(
"ascending"
.
equals
(
isAsc
))
{
isAsc
=
"asc"
;
}
else
if
(
"descending"
.
equals
(
isAsc
))
{
isAsc
=
"desc"
;
}
this
.
isAsc
=
isAsc
;
}
}
}
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment