Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
S
sentinel
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
曲欣亮
sentinel
Commits
77d8c532
Commit
77d8c532
authored
Dec 04, 2018
by
Quxl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
x
parent
bd2cb035
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
AdminUserController.java
...ava/com/egolm/film/api/web/admin/AdminUserController.java
+2
-2
No files found.
src/main/java/com/egolm/film/api/web/admin/AdminUserController.java
View file @
77d8c532
...
...
@@ -51,7 +51,7 @@ public class AdminUserController {
limit
=
limit
==
null
?
20
:
limit
;
Page
page
=
new
Page
(
index
,
limit
);
List
<
Map
<
String
,
Object
>>
list
=
service
.
queryGroupList
(
keyword
,
page
);
return
Rjx
.
jsonOk
().
setData
(
list
);
return
Rjx
.
jsonOk
().
setData
(
list
)
.
setPage
(
page
)
;
}
@ResponseBody
...
...
@@ -110,7 +110,7 @@ public class AdminUserController {
limit
=
limit
==
null
?
20
:
limit
;
Page
page
=
new
Page
(
index
,
limit
);
List
<
Map
<
String
,
Object
>>
list
=
service
.
queryUserList
(
keyword
,
group_id
,
page
);
return
Rjx
.
jsonOk
().
setData
(
list
);
return
Rjx
.
jsonOk
().
setData
(
list
)
.
setPage
(
page
)
;
}
@ResponseBody
...
...
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