Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
C
chnmuseum-party
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
liqin
chnmuseum-party
Commits
d1366fa9
Commit
d1366fa9
authored
Mar 12, 2021
by
liqin
💬
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug fixed
parent
d7b5bc1f
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
RoleController.java
...energy/chnmuseum/party/web/controller/RoleController.java
+3
-3
No files found.
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/RoleController.java
View file @
d1366fa9
...
...
@@ -89,7 +89,7 @@ public class RoleController extends BaseController {
ew
.
like
(
"name"
,
name
);
}
ew
.
eq
(
"is_deleted"
,
0
);
ew
.
orderByAsc
(
"sort"
);
ew
.
orderByAsc
(
"sort
order
"
);
Page
<
Role
>
page
=
this
.
getPage
();
return
ResponseEntity
.
ok
(
this
.
roleService
.
page
(
page
,
ew
));
}
catch
(
Exception
e
)
{
...
...
@@ -112,7 +112,7 @@ public class RoleController extends BaseController {
Map
<
String
,
Object
>
resultMap
=
new
LinkedHashMap
<
String
,
Object
>();
try
{
QueryWrapper
<
Role
>
ew
=
new
QueryWrapper
<>();
ew
.
select
(
"max(sort) as sort"
);
ew
.
select
(
"max(sort
order
) as sort"
);
Role
r
=
this
.
roleService
.
getOne
(
ew
);
if
(
r
!=
null
)
{
role
.
setSortorder
(
r
.
getSortorder
()
+
1
);
...
...
@@ -650,7 +650,7 @@ public class RoleController extends BaseController {
ew
.
select
(
"id"
,
"name"
);
ew
.
eq
(
"is_deleted"
,
0
);
ew
.
eq
(
"status"
,
1
);
ew
.
orderByAsc
(
"sort"
);
ew
.
orderByAsc
(
"sort
order
"
);
ew
.
orderByDesc
(
"update_time"
);
return
ResponseEntity
.
ok
(
this
.
roleService
.
list
(
ew
));
}
catch
(
Exception
e
)
{
...
...
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