diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/ResourceServiceApi.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/ResourceServiceApi.java index 084b60a6d..f8cb9cc1d 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/ResourceServiceApi.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/ResourceServiceApi.java @@ -27,7 +27,6 @@ package cn.stylefeng.roses.kernel.system.api; import cn.stylefeng.roses.kernel.scanner.api.pojo.resource.ResourceDefinition; import cn.stylefeng.roses.kernel.scanner.api.pojo.resource.ResourceUrlParam; -import java.util.List; import java.util.Set; /** @@ -56,6 +55,6 @@ public interface ResourceServiceApi { * @author fengshuonan * @date 2020/11/29 19:49 */ - Set getResourceUrlsListByCodes(List resourceCodes); + Set getResourceUrlsListByCodes(Set resourceCodes); } diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/RoleServiceApi.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/RoleServiceApi.java index bc9cc8c90..dfe9996b1 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/RoleServiceApi.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/RoleServiceApi.java @@ -78,7 +78,7 @@ public interface RoleServiceApi { * @author majianguo * @date 2020/11/5 上午11:17 */ - List getRoleResourceCodeList(List roleIdList); + Set getRoleResourceCodeList(List roleIdList); /** * 获取角色的资源code集合 diff --git a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/service/impl/SysResourceServiceImpl.java b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/service/impl/SysResourceServiceImpl.java index 5f28f8074..86a3c3115 100644 --- a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/service/impl/SysResourceServiceImpl.java +++ b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/service/impl/SysResourceServiceImpl.java @@ -140,7 +140,7 @@ public class SysResourceServiceImpl extends ServiceImpl roleIds = loginUserApi.getLoginUser().getSimpleRoleInfoList().parallelStream().map(SimpleRoleInfo::getRoleId).collect(Collectors.toList()); - List resourceCodeList = roleServiceApi.getRoleResourceCodeList(roleIds); + Set resourceCodeList = roleServiceApi.getRoleResourceCodeList(roleIds); if (!resourceCodeList.isEmpty()) { sysResourceLambdaQueryWrapper.in(SysResource::getResourceCode, resourceCodeList); } @@ -366,7 +366,7 @@ public class SysResourceServiceImpl extends ServiceImpl getResourceUrlsListByCodes(List resourceCodes) { + public Set getResourceUrlsListByCodes(Set resourceCodes) { if (resourceCodes == null || resourceCodes.isEmpty()) { return new HashSet<>(); diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/impl/SysRoleServiceImpl.java b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/impl/SysRoleServiceImpl.java index 5f4e15eba..a1b374244 100644 --- a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/impl/SysRoleServiceImpl.java +++ b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/impl/SysRoleServiceImpl.java @@ -481,9 +481,9 @@ public class SysRoleServiceImpl extends ServiceImpl impl } @Override - public List getRoleResourceCodeList(List roleIdList) { + public Set getRoleResourceCodeList(List roleIdList) { - ArrayList result = new ArrayList<>(); + HashSet result = new HashSet<>(); for (Long roleId : roleIdList) { diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java index a218a43c7..4f49ac7ee 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java @@ -561,7 +561,7 @@ public class SysUserServiceImpl extends ServiceImpl impl SysUserOrgDTO userOrgInfo = sysUserOrgService.getUserOrgByUserId(userId); // 5. 获取用户的所有资源url - List resourceCodeList = roleServiceApi.getRoleResourceCodeList(roleIds); + Set resourceCodeList = roleServiceApi.getRoleResourceCodeList(roleIds); Set resourceUrlsListByCodes = resourceServiceApi.getResourceUrlsListByCodes(resourceCodeList); // 6. 获取用户的所有按钮code集合