From 0d2c924ee4dce7455a0a8b9da3e39a2a7489cf32 Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Tue, 20 Jun 2023 00:00:10 +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=90=E9=A6=96=E9=A1=B5=E7=94=A8=E6=88=B7=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E3=80=91=E6=9D=83=E9=99=90=E7=BC=96=E7=A0=81?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=A4=A7=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sys/modular/login/service/UserIndexInfoService.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/login/service/UserIndexInfoService.java b/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/login/service/UserIndexInfoService.java index 99015c5e1..7171e227e 100644 --- a/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/login/service/UserIndexInfoService.java +++ b/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/login/service/UserIndexInfoService.java @@ -212,7 +212,7 @@ public class UserIndexInfoService { List menuIdList = sysRoleMenuService.getRoleBindMenuIdList(roleIdList); List menuOptionsIdList = sysRoleMenuOptionsService.getRoleBindMenuOptionsIdList(roleIdList); - HashSet permissionCodeList = new HashSet<>(); + Set permissionCodeList = new HashSet<>(); // 获取菜单对应的菜单编码集合 List userMenuList = sysMenuService.getIndexMenuInfoList(menuIdList); @@ -223,6 +223,11 @@ public class UserIndexInfoService { List optionsCodeList = sysMenuOptionsService.getOptionsCodeList(menuOptionsIdList); permissionCodeList.addAll(optionsCodeList); + // 功能编码转化为大写 + if (ObjectUtil.isNotEmpty(permissionCodeList)) { + permissionCodeList = permissionCodeList.stream().map(String::toUpperCase).collect(Collectors.toSet()); + } + userIndexInfo.setPermissionCodeList(permissionCodeList); return userMenuList;