|
|
@@ -83,7 +83,7 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements IM
|
|
|
|
|
|
|
|
|
@Override
|
|
|
- public List<MenuVO> routes(String roleId, Long topMenuId) {
|
|
|
+ public List<MenuVO> routes(String roleId, Long topMenuId,String type) {
|
|
|
if (StringUtil.isBlank(roleId)) {
|
|
|
return null;
|
|
|
}
|
|
|
@@ -111,14 +111,19 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements IM
|
|
|
routes.stream().anyMatch(route -> route.getId().longValue() == x.getId().longValue())
|
|
|
).collect(Collectors.toList());
|
|
|
}
|
|
|
- return buildRoutes(allMenus, roleMenus);
|
|
|
+ return buildRoutes(allMenus, roleMenus,type);
|
|
|
}
|
|
|
|
|
|
- private List<MenuVO> buildRoutes(List<Menu> allMenus, List<Menu> roleMenus) {
|
|
|
+ private List<MenuVO> buildRoutes(List<Menu> allMenus, List<Menu> roleMenus,String type) {
|
|
|
List<Menu> routes = new LinkedList<>(roleMenus);
|
|
|
roleMenus.forEach(roleMenu -> recursion(allMenus, routes, roleMenu));
|
|
|
routes.sort(Comparator.comparing(Menu::getSort));
|
|
|
MenuWrapper menuWrapper = new MenuWrapper();
|
|
|
+ for (Menu item : routes){
|
|
|
+ if ("en".equals(type)){
|
|
|
+ item.setName(item.getAlias());
|
|
|
+ }
|
|
|
+ }
|
|
|
List<Menu> collect = routes.stream().filter(x -> Func.equals(x.getCategory(), 1)).collect(Collectors.toList());
|
|
|
return menuWrapper.listNodeVO(collect);
|
|
|
}
|