From 10e30c770ed615bfe235e471848e81f4c7be0efa Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Fri, 7 Jul 2023 17:29:31 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=908.0=E3=80=91=E3=80=90=E6=9D=83?= =?UTF-8?q?=E9=99=90=E3=80=91=E6=9B=B4=E6=96=B0=E6=9D=83=E9=99=90=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E7=9A=84=E6=98=BE=E7=A4=BA=E9=A1=BA=E5=BA=8F=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sys/modular/role/factory/PermissionAssignFactory.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/factory/PermissionAssignFactory.java b/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/factory/PermissionAssignFactory.java index b9c229a9a..e7136b723 100644 --- a/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/factory/PermissionAssignFactory.java +++ b/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/factory/PermissionAssignFactory.java @@ -12,6 +12,7 @@ import cn.stylefeng.roses.kernel.sys.modular.role.pojo.response.RoleBindPermissi import cn.stylefeng.roses.kernel.sys.modular.role.pojo.response.RoleBindPermissionResponse; import java.util.ArrayList; +import java.util.LinkedHashSet; import java.util.List; import java.util.Set; import java.util.stream.Collectors; @@ -42,8 +43,8 @@ public class PermissionAssignFactory { Set totalParentMenuId = sysMenus.stream().map(SysMenu::getMenuParentId).collect(Collectors.toSet()); // 通过父级菜单，筛选出来所有的叶子节点（如果菜单不存在父级菜单里，则代表是叶子节点） - Set leafMenus = sysMenus.stream().filter(item -> !totalParentMenuId.contains(item)) - .collect(Collectors.toSet()); + Set leafMenus = sysMenus.stream().filter(item -> !totalParentMenuId.contains(item.getMenuId())) + .collect(Collectors.toCollection(LinkedHashSet::new)); // 叶子节点转化为RoleBindPermissionItem结构 ArrayList roleBindPermissionItems = new ArrayList<>();