|
|
|
@ -333,8 +333,10 @@ public class RoleServiceImpl implements RoleService { |
|
|
|
)); |
|
|
|
} |
|
|
|
|
|
|
|
Map<String, Object> paramMap = new HashMap<>(); |
|
|
|
paramMap.put("languageType", languageType); |
|
|
|
// 查询全量菜单
|
|
|
|
List<DashboardTreeMenusDTO> allMenus = basicRoleMenuRelationMapperExt.selectAllMenu(Collections.emptyMap()); |
|
|
|
List<DashboardTreeMenusDTO> allMenus = basicRoleMenuRelationMapperExt.selectAllMenu(paramMap); |
|
|
|
Map<Long, DashboardTreeMenusDTO> fullMenuMap = allMenus.stream() |
|
|
|
.collect(Collectors.toMap(DashboardTreeMenusDTO::getMenuId, m -> m)); |
|
|
|
|
|
|
|
@ -345,7 +347,6 @@ public class RoleServiceImpl implements RoleService { |
|
|
|
visibleMenus = new ArrayList<>(allMenus); |
|
|
|
} else { |
|
|
|
Long roleId = basicRoleMenuRelationMapperExt.getRoleIdByUserId(userId); |
|
|
|
Map<String, Object> paramMap = new HashMap<>(); |
|
|
|
paramMap.put("superRole", superRole); |
|
|
|
paramMap.put("roleId", roleId); |
|
|
|
visibleMenus = basicRoleMenuRelationMapperExt.selectAllMenu(paramMap); |
|
|
|
|