From 12bf5ad349bfc2a829a537bb7a3bca1866a7d1fa Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Tue, 13 Jun 2023 19:44:47 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=907.6.0=E3=80=91=E3=80=90sys=E3=80=91?= =?UTF-8?q?=E3=80=90permission=E3=80=91=E6=9B=B4=E6=96=B0=E7=8A=B6?= =?UTF-8?q?=E6=80=81set=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../role/factory/PermissionAssignFactory.java | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 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 20ca2a9c0..34920fcf4 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 @@ -1,5 +1,6 @@ package cn.stylefeng.roses.kernel.sys.modular.role.factory; +import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; import cn.stylefeng.roses.kernel.rule.constants.TreeConstants; import cn.stylefeng.roses.kernel.rule.tree.factory.DefaultTreeBuildFactory; @@ -171,7 +172,7 @@ public class PermissionAssignFactory { } for (RoleBindPermissionItem roleBindPermissionItem : beFilled) { - if (rolePermissionList.contains(roleBindPermissionItem.getNodeId())) { + if (rolePermissionList.contains(Convert.toLong(roleBindPermissionItem.getNodeId()))) { roleBindPermissionItem.setChecked(true); } @@ -187,16 +188,22 @@ public class PermissionAssignFactory { * @author fengshuonan * @since 2023/6/13 19:25 */ - private static void fillParentCheckedFlag(RoleBindPermissionItem beFilled) { + private static void fillParentCheckedFlag(RoleBindPermissionItem appItem) { - if (ObjectUtil.isEmpty(beFilled)) { + if (ObjectUtil.isEmpty(appItem)) { return; } - beFilled.setChecked(true); - for (RoleBindPermissionItem item : beFilled.getChildren()) { - if (!item.getChecked()) { - beFilled.setChecked(false); + appItem.setChecked(true); + for (RoleBindPermissionItem menuItem : appItem.getChildren()) { + if (!menuItem.getChecked()) { + appItem.setChecked(false); + } + + for (RoleBindPermissionItem options : menuItem.getChildren()) { + if (!options.getChecked()) { + appItem.setChecked(false); + } } } }