|
@@ -331,9 +331,17 @@ public class PermissionServiceImpl implements PermissionService {
|
|
|
public Boolean isHavePermission(Long userId, String... permissions) {
|
|
|
List<UserRoleDO> userRoleDOS = userRoleMapper.selectList(new LambdaQueryWrapper<UserRoleDO>()
|
|
|
.eq(UserRoleDO::getUserId, userId));
|
|
|
+ //代表这个系统用户没有角色
|
|
|
+ if(userRoleDOS.isEmpty()){
|
|
|
+ return false;
|
|
|
+ }
|
|
|
List<Long> roleIds = userRoleDOS.stream().map(UserRoleDO::getRoleId).collect(Collectors.toList());
|
|
|
List<RoleMenuDO> roleMenuDOS = roleMenuMapper.selectList(new LambdaQueryWrapper<RoleMenuDO>()
|
|
|
.in(RoleMenuDO::getRoleId, roleIds));
|
|
|
+ //角色没有权限
|
|
|
+ if(roleMenuDOS.isEmpty()){
|
|
|
+ return false;
|
|
|
+ }
|
|
|
List<Long> menuIds = roleMenuDOS.stream().map(RoleMenuDO::getMenuId).collect(Collectors.toList());
|
|
|
|
|
|
List<MenuDO> menuList = menuService.getMenuList(menuIds);
|