ruoyi/RuoYi
1
0
Fork 0
mirror of https://github.com/yangzongzhuan/RuoYi.git synced 2026-01-18 08:24:58 +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

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);