Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
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
fangxinjiang
yifu-mvp
Commits
cb5792c6
Commit
cb5792c6
authored
Mar 04, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
代码优化-fxj
parent
eb5a9506
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
4 deletions
+11
-4
MenuController.java
...u/cloud/plus/v1/yifu/admin/controller/MenuController.java
+10
-3
SysDeptMapper.xml
...yifu-upms-biz/src/main/resources/mapper/SysDeptMapper.xml
+1
-1
No files found.
yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/controller/MenuController.java
View file @
cb5792c6
...
@@ -89,9 +89,16 @@ public class MenuController {
...
@@ -89,9 +89,16 @@ public class MenuController {
if
(
Common
.
isEmpty
(
clientId
)){
if
(
Common
.
isEmpty
(
clientId
)){
clientId
=
ClientNameConstants
.
CLIENT_MVP
;
clientId
=
ClientNameConstants
.
CLIENT_MVP
;
}
}
Set
<
SysMenu
>
menuSet
=
SecurityUtils
.
getRolesByClient
(
clientId
).
stream
().
map
(
sysMenuService:
:
findMenuByRoleId
)
List
<
Long
>
roles
=
SecurityUtils
.
getRolesByClient
(
clientId
);
.
flatMap
(
Collection:
:
stream
).
collect
(
Collectors
.
toSet
());
Set
<
SysMenu
>
menuSet
=
null
;
return
R
.
ok
(
sysMenuService
.
filterMenu
(
menuSet
,
parentId
));
if
(
Common
.
isNotNull
(
roles
)){
menuSet
=
roles
.
stream
().
map
(
sysMenuService:
:
findMenuByRoleId
)
.
flatMap
(
Collection:
:
stream
).
collect
(
Collectors
.
toSet
());
}
if
(
Common
.
isNotNull
(
menuSet
)){
return
R
.
ok
(
sysMenuService
.
filterMenu
(
menuSet
,
parentId
));
}
return
R
.
failed
(
"获取菜单失败"
);
}
}
/**
/**
...
...
yifu-upms/yifu-upms-biz/src/main/resources/mapper/SysDeptMapper.xml
View file @
cb5792c6
...
@@ -55,7 +55,7 @@
...
@@ -55,7 +55,7 @@
<select
id=
"getDeptListByDeptId"
resultType=
"com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysDept"
>
<select
id=
"getDeptListByDeptId"
resultType=
"com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysDept"
>
select
select
dept_id as deptId,
dept_id as deptId,
dept_
name as deptName
name as deptName
from
from
sys_dept
sys_dept
where
where
...
...
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