Commit fe356559 authored by suntao's avatar suntao

忘记改的什么了

parent 71e430d3
...@@ -33,7 +33,7 @@ public class Principal implements Serializable { ...@@ -33,7 +33,7 @@ public class Principal implements Serializable {
/** /**
* 角色列表 * 角色列表
*/ */
private List<Role> roles; private Role roles;
/** /**
* 登录时间 * 登录时间
......
...@@ -34,18 +34,16 @@ public class UserDetailInfo { ...@@ -34,18 +34,16 @@ public class UserDetailInfo {
Long userId = principal.getUserInfo().getUserId(); Long userId = principal.getUserInfo().getUserId();
userDetailInfo.setRank(principal.getRank().name()); userDetailInfo.setRank(principal.getRank().name());
userDetailInfo.setChannelId(principal.getChannelId()); userDetailInfo.setChannelId(principal.getChannelId());
List<Role> roles = principal.getRoles(); Role role = principal.getRoles();
if (null != roles && roles.size() > 0) { if (null != role) {
RoleInfo roleInfo = new RoleInfo(); RoleInfo roleInfo = new RoleInfo();
List<RoleInfo.RoleView> roleInfos = Lists.newArrayList(); List<RoleInfo.RoleView> roleInfos = Lists.newArrayList();
roles.forEach(role -> { RoleInfo.RoleView roleView = new RoleInfo.RoleView();
RoleInfo.RoleView roleView = new RoleInfo.RoleView(); roleView.setRoleId(role.getId());
roleView.setRoleId(role.getId()); roleView.setRoleName(role.getName());
roleView.setRoleName(role.getName()); roleInfos.add(roleView);
roleInfos.add(roleView);
});
roleInfo.setRoleInfos(roleInfos); roleInfo.setRoleInfos(roleInfos);
userDetailInfo.setRoleInfo(roleInfo); userDetailInfo.setRoleInfo(roleInfo);
} }
......
...@@ -66,13 +66,11 @@ public class ApplicationSecurityHandler implements SecurityHandler { ...@@ -66,13 +66,11 @@ public class ApplicationSecurityHandler implements SecurityHandler {
// 如果是超级管理员跳过权限验证 // 如果是超级管理员跳过权限验证
boolean hasPrivilege = principal.isSuperAdministrator() || principal.getRoles().stream().anyMatch(role -> { boolean hasPrivilege = principal.isSuperAdministrator();
List<Role> roleList = getRoleAndParent(role);
if (CollectionUtils.isEmpty(roleList)) { List<Role> roleList = getRoleAndParent(principal.getRoles());
return false; hasPrivilege &= CollectionUtils.isEmpty(roleList);
} hasPrivilege &= roleList.stream().anyMatch(roleItem -> this.checkAuthority(authorityId, roleItem));
return roleList.stream().anyMatch(roleItem -> this.checkAuthority(authorityId, roleItem));
});
if (hasPrivilege) { if (hasPrivilege) {
return new Tuple<>(Boolean.TRUE, null); return new Tuple<>(Boolean.TRUE, null);
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment