diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/SysUserDetailsServiceImpl.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/SysUserDetailsServiceImpl.java index 587816e8..22979b6f 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/SysUserDetailsServiceImpl.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/SysUserDetailsServiceImpl.java @@ -74,7 +74,7 @@ public class SysUserDetailsServiceImpl implements UserDetailsService { userResources.put(UserResourceConstant.RESOURCE_ROLE_ID, roleIds); // 如果有自定义的协调者,进行资源处理 if (userResourceCoordinator != null) { - userResources = userResourceCoordinator.coordinate(userResources); + userResources = userResourceCoordinator.coordinate(userResources, sysUser); } return new SysUserDetails(sysUser, authorities, userResources); diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/UserResourceCoordinator.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/UserResourceCoordinator.java index fb1219b0..7c4fb883 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/UserResourceCoordinator.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/UserResourceCoordinator.java @@ -1,5 +1,7 @@ package com.hccake.ballcat.admin.oauth; +import com.hccake.ballcat.admin.modules.sys.model.entity.SysUser; + import java.util.Collection; import java.util.Map; @@ -15,8 +17,9 @@ public interface UserResourceCoordinator { /** * 获取用户资源关联Map * @param userResources 用户资源 + * @param user 用户信息 * @return 用户资源关联Map => key: resource,value: 资源项 */ - Map> coordinate(Map> userResources); + Map> coordinate(Map> userResources, SysUser user); }