|
@@ -200,9 +200,11 @@ public class PermissionServiceImp implements PermissionService { |
|
@@ -200,9 +200,11 @@ public class PermissionServiceImp implements PermissionService { |
200
|
.map((perm) ->{
|
200
|
.map((perm) ->{
|
201
|
perm.setChildren(getChildrens(perm, loginedUserMenus));
|
201
|
perm.setChildren(getChildrens(perm, loginedUserMenus));
|
202
|
return perm;
|
202
|
return perm;
|
203
|
- }).sorted((befor,after) -> {
|
|
|
204
|
- return (befor.getPermissionOrder() == null ? 0 : Integer.parseInt(befor.getPermissionOrder())) - (after.getPermissionOrder() == null ? 0 : Integer.parseInt(after.getPermissionOrder()));
|
|
|
205
|
- }).collect(Collectors.toList());
|
203
|
+ })
|
|
|
204
|
+// .sorted((befor,after) -> {
|
|
|
205
|
+// return (befor.getPermissionOrder() == null ? 0 : Integer.parseInt(befor.getPermissionOrder())) - (after.getPermissionOrder() == null ? 0 : Integer.parseInt(after.getPermissionOrder()));
|
|
|
206
|
+// })
|
|
|
207
|
+ .collect(Collectors.toList());
|
206
|
return loginedUserMenusTree;
|
208
|
return loginedUserMenusTree;
|
207
|
}
|
209
|
}
|
208
|
|
210
|
|
|
@@ -214,9 +216,11 @@ public class PermissionServiceImp implements PermissionService { |
|
@@ -214,9 +216,11 @@ public class PermissionServiceImp implements PermissionService { |
214
|
//1、找到子菜单(递归)
|
216
|
//1、找到子菜单(递归)
|
215
|
categoryEntity.setChildren(getChildrens(categoryEntity, listAll));
|
217
|
categoryEntity.setChildren(getChildrens(categoryEntity, listAll));
|
216
|
return categoryEntity;
|
218
|
return categoryEntity;
|
217
|
- }).sorted((befor,after) -> {
|
|
|
218
|
- return (befor.getPermissionOrder() == null ? 0 : Integer.parseInt(befor.getPermissionOrder())) - (after.getPermissionOrder() == null ? 0 : Integer.parseInt(after.getPermissionOrder()));
|
|
|
219
|
- }).collect(Collectors.toList());
|
219
|
+ })
|
|
|
220
|
+// .sorted((befor,after) -> {
|
|
|
221
|
+// return (befor.getPermissionOrder() == null ? 0 : Integer.parseInt(befor.getPermissionOrder())) - (after.getPermissionOrder() == null ? 0 : Integer.parseInt(after.getPermissionOrder()));
|
|
|
222
|
+// })
|
|
|
223
|
+ .collect(Collectors.toList());
|
220
|
|
224
|
|
221
|
return children;
|
225
|
return children;
|
222
|
|
226
|
|