Commit cb5792c6 authored by fangxinjiang's avatar fangxinjiang

代码优化-fxj

parent eb5a9506
...@@ -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("获取菜单失败");
} }
/** /**
......
...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment