Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
黄嘉阳
/
iot-platform-server
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
76f4cbdb
authored
Sep 20, 2023
by
李小龙
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
fixbug:28838 saas-租户管理-资源管理:新增/编辑里排序说明是从大到小排序,在资源管理列表、平台端菜单展示是从小到大,需要统一
parent
48dcbd46
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
5 deletions
saas-module/src/main/java/com/makeit/controller/saas/SaasPlatMenuController.java
server-service/src/main/java/com/makeit/service/platform/auth/impl/PlatRoleServiceImpl.java
server-service/src/main/java/com/makeit/service/platform/auth/impl/PlatUserServiceImpl.java
server-service/src/main/java/com/makeit/service/saas/impl/PlatMenuServiceImpl.java
saas-module/src/main/java/com/makeit/controller/saas/SaasPlatMenuController.java
View file @
76f4cbdb
...
...
@@ -78,7 +78,7 @@ public class SaasPlatMenuController {
@Action
(
module
=
"saas端-租户资源管理(菜单)"
,
name
=
"编辑"
,
code
=
"saas:plat:menu:edit"
)
@ApiOperation
(
"编辑"
)
@PostMapping
(
"edit"
)
public
ApiResponseEntity
<
?
>
edit
(
@Validated
@RequestBody
PlatMenuDTOVO
dto
){
public
ApiResponseEntity
<
Void
>
edit
(
@Validated
@RequestBody
PlatMenuDTOVO
dto
){
platMenuService
.
edit
(
dto
);
saasOperationLogService
.
add
(
"saas端-租户资源管理-编辑"
,
null
);
...
...
server-service/src/main/java/com/makeit/service/platform/auth/impl/PlatRoleServiceImpl.java
View file @
76f4cbdb
...
...
@@ -327,7 +327,7 @@ implements PlatRoleService {
List
<
PlatMenu
>
platMenuList
=
platMenuService
.
list
(
new
QueryWrapper
<
PlatMenu
>().
lambda
()
.
in
(
StringUtils
.
isNotBlank
(
id
),
PlatMenu:
:
getId
,
menuIdList
)
//.orderByAsc(PlatMenu::getParentId)
.
orderBy
A
sc
(
PlatMenu:
:
getSort
)
.
orderBy
De
sc
(
PlatMenu:
:
getSort
)
.
orderByAsc
(
PlatMenu:
:
getCreateDate
)
);
...
...
server-service/src/main/java/com/makeit/service/platform/auth/impl/PlatUserServiceImpl.java
View file @
76f4cbdb
...
...
@@ -475,7 +475,7 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser>
return
platMenuService
.
list
(
new
QueryWrapper
<
PlatMenu
>().
lambda
()
.
in
(
PlatMenu:
:
getId
,
menuIdList
)
.
eq
(
PlatMenu:
:
getStatus
,
CommonEnum
.
YES
.
getValue
())
.
orderBy
A
sc
(
PlatMenu:
:
getSort
)
.
orderBy
De
sc
(
PlatMenu:
:
getSort
)
.
orderByAsc
(
PlatMenu:
:
getCreateDate
)
);
}
...
...
@@ -542,7 +542,7 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser>
List
<
PlatMenu
>
menuList
=
platMenuService
.
list
(
new
QueryWrapper
<
PlatMenu
>().
lambda
()
.
in
(
PlatMenu:
:
getId
,
menuIdList
)
.
eq
(
PlatMenu:
:
getStatus
,
CommonEnum
.
YES
.
getValue
())
.
orderBy
A
sc
(
PlatMenu:
:
getSort
)
.
orderBy
De
sc
(
PlatMenu:
:
getSort
)
.
orderByAsc
(
PlatMenu:
:
getCreateDate
)
);
...
...
server-service/src/main/java/com/makeit/service/saas/impl/PlatMenuServiceImpl.java
View file @
76f4cbdb
...
...
@@ -70,7 +70,7 @@ public class PlatMenuServiceImpl extends ServiceImpl<PlatMenuMapper, PlatMenu>
.
eq
(
StringUtils
.
isNotBlank
(
dto
.
getStatus
()),
PlatMenu:
:
getStatus
,
dto
.
getStatus
())
.
in
(
StringUtils
.
isNotBlank
(
dto
.
getTenantId
()),
PlatMenu:
:
getId
,
menuIdList
)
//.orderByAsc(PlatMenu::getParentId)
.
orderBy
A
sc
(
PlatMenu:
:
getSort
)
.
orderBy
De
sc
(
PlatMenu:
:
getSort
)
.
orderByAsc
(
PlatMenu:
:
getCreateDate
)
);
...
...
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