...
|
...
|
@@ -200,9 +200,11 @@ public class PermissionServiceImp implements PermissionService { |
|
|
.map((perm) ->{
|
|
|
perm.setChildren(getChildrens(perm, loginedUserMenus));
|
|
|
return perm;
|
|
|
}).sorted((befor,after) -> {
|
|
|
return (befor.getPermissionOrder() == null ? 0 : Integer.parseInt(befor.getPermissionOrder())) - (after.getPermissionOrder() == null ? 0 : Integer.parseInt(after.getPermissionOrder()));
|
|
|
}).collect(Collectors.toList());
|
|
|
})
|
|
|
// .sorted((befor,after) -> {
|
|
|
// return (befor.getPermissionOrder() == null ? 0 : Integer.parseInt(befor.getPermissionOrder())) - (after.getPermissionOrder() == null ? 0 : Integer.parseInt(after.getPermissionOrder()));
|
|
|
// })
|
|
|
.collect(Collectors.toList());
|
|
|
return loginedUserMenusTree;
|
|
|
}
|
|
|
|
...
|
...
|
@@ -214,9 +216,11 @@ public class PermissionServiceImp implements PermissionService { |
|
|
//1、找到子菜单(递归)
|
|
|
categoryEntity.setChildren(getChildrens(categoryEntity, listAll));
|
|
|
return categoryEntity;
|
|
|
}).sorted((befor,after) -> {
|
|
|
return (befor.getPermissionOrder() == null ? 0 : Integer.parseInt(befor.getPermissionOrder())) - (after.getPermissionOrder() == null ? 0 : Integer.parseInt(after.getPermissionOrder()));
|
|
|
}).collect(Collectors.toList());
|
|
|
})
|
|
|
// .sorted((befor,after) -> {
|
|
|
// return (befor.getPermissionOrder() == null ? 0 : Integer.parseInt(befor.getPermissionOrder())) - (after.getPermissionOrder() == null ? 0 : Integer.parseInt(after.getPermissionOrder()));
|
|
|
// })
|
|
|
.collect(Collectors.toList());
|
|
|
|
|
|
return children;
|
|
|
|
...
|
...
|
|