Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
finance-manage
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
finance-oa
finance-manage
Commits
a15bfdfb
Commit
a15bfdfb
authored
Sep 02, 2021
by
RuoYi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
防止表格最后页最后项删除变成暂无数据
parent
ee823b83
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
5 additions
and
13 deletions
+5
-13
ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java
.../src/main/java/com/ruoyi/common/core/page/PageDomain.java
+5
-1
ruoyi-ui/src/views/monitor/job/index.vue
ruoyi-ui/src/views/monitor/job/index.vue
+0
-1
ruoyi-ui/src/views/monitor/job/log.vue
ruoyi-ui/src/views/monitor/job/log.vue
+0
-1
ruoyi-ui/src/views/monitor/logininfor/index.vue
ruoyi-ui/src/views/monitor/logininfor/index.vue
+0
-1
ruoyi-ui/src/views/system/config/index.vue
ruoyi-ui/src/views/system/config/index.vue
+0
-1
ruoyi-ui/src/views/system/dict/data.vue
ruoyi-ui/src/views/system/dict/data.vue
+0
-1
ruoyi-ui/src/views/system/dict/index.vue
ruoyi-ui/src/views/system/dict/index.vue
+0
-1
ruoyi-ui/src/views/system/notice/index.vue
ruoyi-ui/src/views/system/notice/index.vue
+0
-1
ruoyi-ui/src/views/system/post/index.vue
ruoyi-ui/src/views/system/post/index.vue
+0
-1
ruoyi-ui/src/views/system/role/authUser.vue
ruoyi-ui/src/views/system/role/authUser.vue
+0
-1
ruoyi-ui/src/views/system/role/index.vue
ruoyi-ui/src/views/system/role/index.vue
+0
-1
ruoyi-ui/src/views/system/user/index.vue
ruoyi-ui/src/views/system/user/index.vue
+0
-1
ruoyi-ui/src/views/tool/gen/index.vue
ruoyi-ui/src/views/tool/gen/index.vue
+0
-1
No files found.
ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java
View file @
a15bfdfb
...
@@ -22,7 +22,7 @@ public class PageDomain
...
@@ -22,7 +22,7 @@ public class PageDomain
private
String
isAsc
=
"asc"
;
private
String
isAsc
=
"asc"
;
/** 分页参数合理化 */
/** 分页参数合理化 */
private
Boolean
reasonable
=
fals
e
;
private
Boolean
reasonable
=
tru
e
;
public
String
getOrderBy
()
public
String
getOrderBy
()
{
{
...
@@ -87,6 +87,10 @@ public class PageDomain
...
@@ -87,6 +87,10 @@ public class PageDomain
public
Boolean
getReasonable
()
public
Boolean
getReasonable
()
{
{
if
(
StringUtils
.
isNull
(
reasonable
))
{
return
Boolean
.
TRUE
;
}
return
reasonable
;
return
reasonable
;
}
}
...
...
ruoyi-ui/src/views/monitor/job/index.vue
View file @
a15bfdfb
...
@@ -320,7 +320,6 @@ export default {
...
@@ -320,7 +320,6 @@ export default {
queryParams
:
{
queryParams
:
{
pageNum
:
1
,
pageNum
:
1
,
pageSize
:
10
,
pageSize
:
10
,
reasonable
:
true
,
jobName
:
undefined
,
jobName
:
undefined
,
jobGroup
:
undefined
,
jobGroup
:
undefined
,
status
:
undefined
status
:
undefined
...
...
ruoyi-ui/src/views/monitor/job/log.vue
View file @
a15bfdfb
...
@@ -220,7 +220,6 @@ export default {
...
@@ -220,7 +220,6 @@ export default {
queryParams
:
{
queryParams
:
{
pageNum
:
1
,
pageNum
:
1
,
pageSize
:
10
,
pageSize
:
10
,
reasonable
:
true
,
jobName
:
undefined
,
jobName
:
undefined
,
jobGroup
:
undefined
,
jobGroup
:
undefined
,
status
:
undefined
status
:
undefined
...
...
ruoyi-ui/src/views/monitor/logininfor/index.vue
View file @
a15bfdfb
...
@@ -153,7 +153,6 @@ export default {
...
@@ -153,7 +153,6 @@ export default {
queryParams
:
{
queryParams
:
{
pageNum
:
1
,
pageNum
:
1
,
pageSize
:
10
,
pageSize
:
10
,
reasonable
:
true
,
ipaddr
:
undefined
,
ipaddr
:
undefined
,
userName
:
undefined
,
userName
:
undefined
,
status
:
undefined
status
:
undefined
...
...
ruoyi-ui/src/views/system/config/index.vue
View file @
a15bfdfb
...
@@ -219,7 +219,6 @@ export default {
...
@@ -219,7 +219,6 @@ export default {
queryParams
:
{
queryParams
:
{
pageNum
:
1
,
pageNum
:
1
,
pageSize
:
10
,
pageSize
:
10
,
reasonable
:
true
,
configName
:
undefined
,
configName
:
undefined
,
configKey
:
undefined
,
configKey
:
undefined
,
configType
:
undefined
configType
:
undefined
...
...
ruoyi-ui/src/views/system/dict/data.vue
View file @
a15bfdfb
...
@@ -247,7 +247,6 @@ export default {
...
@@ -247,7 +247,6 @@ export default {
queryParams
:
{
queryParams
:
{
pageNum
:
1
,
pageNum
:
1
,
pageSize
:
10
,
pageSize
:
10
,
reasonable
:
true
,
dictName
:
undefined
,
dictName
:
undefined
,
dictType
:
undefined
,
dictType
:
undefined
,
status
:
undefined
status
:
undefined
...
...
ruoyi-ui/src/views/system/dict/index.vue
View file @
a15bfdfb
...
@@ -227,7 +227,6 @@ export default {
...
@@ -227,7 +227,6 @@ export default {
queryParams
:
{
queryParams
:
{
pageNum
:
1
,
pageNum
:
1
,
pageSize
:
10
,
pageSize
:
10
,
reasonable
:
true
,
dictName
:
undefined
,
dictName
:
undefined
,
dictType
:
undefined
,
dictType
:
undefined
,
status
:
undefined
status
:
undefined
...
...
ruoyi-ui/src/views/system/notice/index.vue
View file @
a15bfdfb
...
@@ -204,7 +204,6 @@ export default {
...
@@ -204,7 +204,6 @@ export default {
queryParams
:
{
queryParams
:
{
pageNum
:
1
,
pageNum
:
1
,
pageSize
:
10
,
pageSize
:
10
,
reasonable
:
true
,
noticeTitle
:
undefined
,
noticeTitle
:
undefined
,
createBy
:
undefined
,
createBy
:
undefined
,
status
:
undefined
status
:
undefined
...
...
ruoyi-ui/src/views/system/post/index.vue
View file @
a15bfdfb
...
@@ -192,7 +192,6 @@ export default {
...
@@ -192,7 +192,6 @@ export default {
queryParams
:
{
queryParams
:
{
pageNum
:
1
,
pageNum
:
1
,
pageSize
:
10
,
pageSize
:
10
,
reasonable
:
true
,
postCode
:
undefined
,
postCode
:
undefined
,
postName
:
undefined
,
postName
:
undefined
,
status
:
undefined
status
:
undefined
...
...
ruoyi-ui/src/views/system/role/authUser.vue
View file @
a15bfdfb
...
@@ -128,7 +128,6 @@ export default {
...
@@ -128,7 +128,6 @@ export default {
queryParams
:
{
queryParams
:
{
pageNum
:
1
,
pageNum
:
1
,
pageSize
:
10
,
pageSize
:
10
,
reasonable
:
true
,
roleId
:
undefined
,
roleId
:
undefined
,
userName
:
undefined
,
userName
:
undefined
,
phonenumber
:
undefined
phonenumber
:
undefined
...
...
ruoyi-ui/src/views/system/role/index.vue
View file @
a15bfdfb
...
@@ -328,7 +328,6 @@ export default {
...
@@ -328,7 +328,6 @@ export default {
queryParams
:
{
queryParams
:
{
pageNum
:
1
,
pageNum
:
1
,
pageSize
:
10
,
pageSize
:
10
,
reasonable
:
true
,
roleName
:
undefined
,
roleName
:
undefined
,
roleKey
:
undefined
,
roleKey
:
undefined
,
status
:
undefined
status
:
undefined
...
...
ruoyi-ui/src/views/system/user/index.vue
View file @
a15bfdfb
...
@@ -418,7 +418,6 @@ export default {
...
@@ -418,7 +418,6 @@ export default {
queryParams
:
{
queryParams
:
{
pageNum
:
1
,
pageNum
:
1
,
pageSize
:
10
,
pageSize
:
10
,
reasonable
:
true
,
userName
:
undefined
,
userName
:
undefined
,
phonenumber
:
undefined
,
phonenumber
:
undefined
,
status
:
undefined
,
status
:
undefined
,
...
...
ruoyi-ui/src/views/tool/gen/index.vue
View file @
a15bfdfb
...
@@ -219,7 +219,6 @@ export default {
...
@@ -219,7 +219,6 @@ export default {
queryParams
:
{
queryParams
:
{
pageNum
:
1
,
pageNum
:
1
,
pageSize
:
10
,
pageSize
:
10
,
reasonable
:
true
,
tableName
:
undefined
,
tableName
:
undefined
,
tableComment
:
undefined
tableComment
:
undefined
},
},
...
...
Write
Preview
Markdown
is supported
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