diff --git a/src/main/java/com/youlai/boot/core/security/model/SysUserDetails.java b/src/main/java/com/youlai/boot/core/security/model/SysUserDetails.java index 5fbf1f6c..633dbb0d 100644 --- a/src/main/java/com/youlai/boot/core/security/model/SysUserDetails.java +++ b/src/main/java/com/youlai/boot/core/security/model/SysUserDetails.java @@ -36,8 +36,6 @@ public class SysUserDetails implements UserDetails { private Collection authorities; - private Set perms; - private Long deptId; private Integer dataScope; @@ -57,7 +55,6 @@ public class SysUserDetails implements UserDetails { this.username = user.getUsername(); this.password = user.getPassword(); this.enabled = ObjectUtil.equal(user.getStatus(), 1); - this.perms = user.getPerms(); this.deptId = user.getDeptId(); this.dataScope = user.getDataScope(); } diff --git a/src/main/java/com/youlai/boot/system/model/dto/UserAuthInfo.java b/src/main/java/com/youlai/boot/system/model/dto/UserAuthInfo.java index fff8242d..49fde52a 100644 --- a/src/main/java/com/youlai/boot/system/model/dto/UserAuthInfo.java +++ b/src/main/java/com/youlai/boot/system/model/dto/UserAuthInfo.java @@ -48,11 +48,6 @@ public class UserAuthInfo { */ private Set roles; - /** - * 用户拥有的权限集合 - */ - private Set perms; - /** * 数据权限范围,用于控制用户可以访问的数据级别 * diff --git a/src/main/java/com/youlai/boot/system/service/impl/UserServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/UserServiceImpl.java index a94b220b..c2abd1e9 100644 --- a/src/main/java/com/youlai/boot/system/service/impl/UserServiceImpl.java +++ b/src/main/java/com/youlai/boot/system/service/impl/UserServiceImpl.java @@ -202,11 +202,6 @@ public class UserServiceImpl extends ServiceImpl implements Us UserAuthInfo userAuthInfo = this.baseMapper.getUserAuthInfo(username); if (userAuthInfo != null) { Set roles = userAuthInfo.getRoles(); - if (CollectionUtil.isNotEmpty(roles)) { - Set perms = roleMenuService.getRolePermsByRoleCodes(roles); - userAuthInfo.setPerms(perms); - } - // 获取最大范围的数据权限 Integer dataScope = roleService.getMaximumDataScope(roles); userAuthInfo.setDataScope(dataScope); @@ -226,11 +221,6 @@ public class UserServiceImpl extends ServiceImpl implements Us UserAuthInfo userAuthInfo = this.baseMapper.getUserAuthInfoByOpenId(openid); if (userAuthInfo != null) { Set roles = userAuthInfo.getRoles(); - if (CollectionUtil.isNotEmpty(roles)) { - Set perms = roleMenuService.getRolePermsByRoleCodes(roles); - userAuthInfo.setPerms(perms); - } - // 获取最大范围的数据权限 Integer dataScope = roleService.getMaximumDataScope(roles); userAuthInfo.setDataScope(dataScope);