ruoyi/RuoYi
1
0
Fork 0
mirror of https://github.com/yangzongzhuan/RuoYi.git synced 2026-01-14 14:34:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

将isAdmin方法统一到ShiroUtils

Browse Source
This commit is contained in:
RuoYi
2026-01-04 16:34:55 +08:00
parent 7cb940b86b
commit fa6537aede
8 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
View File

@@ -162,7 +162,7 @@ public class SysUserController extends BaseController
userService.checkUserDataScope(userId);
List<SysRole> roles = roleService.selectRolesByUserId(userId);
mmap.put("user", userService.selectUserById(userId));
mmap.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
mmap.put("roles", ShiroUtils.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
mmap.put("posts", postService.selectPostsByUserId(userId));
return prefix + "/edit";
}
@@ -253,7 +253,7 @@ public class SysUserController extends BaseController
// 获取用户所属的角色列表
List<SysRole> roles = roleService.selectRolesByUserId(userId);
mmap.put("user", user);
mmap.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
mmap.put("roles", ShiroUtils.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
return prefix + "/authRole";
}

8
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
View File

@@ -11,6 +11,7 @@ import com.ruoyi.common.annotation.Excel.ColumnType;
import com.ruoyi.common.annotation.Excel.Type;
import com.ruoyi.common.annotation.Excels;
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.common.utils.ShiroUtils;
import com.ruoyi.common.xss.Xss;
/**
@@ -123,12 +124,7 @@ public class SysUser extends BaseEntity
public boolean isAdmin()
{
return isAdmin(this.userId);
}
public static boolean isAdmin(Long userId)
{
return userId != null && 1L == userId;
return ShiroUtils.isAdmin(this.userId);
}
public Long getDeptId()

2
ruoyi-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java
View File

@@ -3,7 +3,7 @@ package com.ruoyi.common.exception.file;
import java.util.Arrays;
/**
* 文件上传 误异常类
* 文件上传无效扩展名异常类
*
* @author ruoyi
*/

21
ruoyi-common/src/main/java/com/ruoyi/common/utils/ShiroUtils.java
View File

@@ -73,6 +73,27 @@ public class ShiroUtils
return String.valueOf(getSubject().getSession().getId());
}
/**
* 是否为管理员
*
* @return 结果
*/
public static boolean isAdmin()
{
return isAdmin(getUserId());
}
/**
* 是否为管理员
*
* @param userId 用户ID
* @return 结果
*/
public static boolean isAdmin(Long userId)
{
return userId != null && 1L == userId;
}
/**
* 生成随机盐
*/

3
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
View File

@@ -11,7 +11,6 @@ import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.Ztree;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.ShiroUtils;
@@ -314,7 +313,7 @@ public class SysDeptServiceImpl implements ISysDeptService
@Override
public void checkDeptDataScope(Long deptId)
{
if (!SysUser.isAdmin(ShiroUtils.getUserId()) && StringUtils.isNotNull(deptId))
if (!ShiroUtils.isAdmin() && StringUtils.isNotNull(deptId))
{
SysDept dept = new SysDept();
dept.setDeptId(deptId);

5
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
View File

@@ -19,6 +19,7 @@ import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.ShiroUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.mapper.SysMenuMapper;
import com.ruoyi.system.mapper.SysRoleMenuMapper;
@@ -71,7 +72,7 @@ public class SysMenuServiceImpl implements ISysMenuService
public List<SysMenu> selectMenuList(SysMenu menu, Long userId)
{
List<SysMenu> menuList = null;
if (SysUser.isAdmin(userId))
if (ShiroUtils.isAdmin(userId))
{
menuList = menuMapper.selectMenuList(menu);
}
@@ -92,7 +93,7 @@ public class SysMenuServiceImpl implements ISysMenuService
public List<SysMenu> selectMenuAll(Long userId)
{
List<SysMenu> menuList = null;
if (SysUser.isAdmin(userId))
if (ShiroUtils.isAdmin(userId))
{
menuList = menuMapper.selectMenuAll();
}

3
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
View File

@@ -11,7 +11,6 @@ import org.springframework.transaction.annotation.Transactional;
import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.ShiroUtils;
@@ -329,7 +328,7 @@ public class SysRoleServiceImpl implements ISysRoleService
@Override
public void checkRoleDataScope(Long... roleIds)
{
if (!SysUser.isAdmin(ShiroUtils.getUserId()))
if (!ShiroUtils.isAdmin())
{
for (Long roleId : roleIds)
{

2
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
View File

@@ -455,7 +455,7 @@ public class SysUserServiceImpl implements ISysUserService
@Override
public void checkUserDataScope(Long userId)
{
if (!SysUser.isAdmin(ShiroUtils.getUserId()))
if (!ShiroUtils.isAdmin())
{
SysUser user = new SysUser();
user.setUserId(userId);