update 优化 是否为管理员的判断

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysRole.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.constant.UserConstants;
 import com.ruoyi.common.core.web.domain.BaseEntity;
 import com.ruoyi.common.excel.annotation.ExcelDictFormat;
 import com.ruoyi.common.excel.convert.ExcelDictConvert;
@@ -132,11 +133,7 @@ public class SysRole extends BaseEntity {
 
     @ApiModelProperty(value = "是否管理员")
     public boolean isAdmin() {
-        return isAdmin(this.roleId);
+        return UserConstants.ADMIN_ID.equals(this.roleId);
-    }
-
-    public static boolean isAdmin(Long roleId) {
-        return roleId != null && 1L == roleId;
     }
 
 }

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ruoyi.common.core.annotation.Sensitive;
+import com.ruoyi.common.core.constant.UserConstants;
 import com.ruoyi.common.core.enums.SensitiveStrategy;
 import com.ruoyi.common.core.web.domain.BaseEntity;
 import com.ruoyi.common.core.xss.Xss;
@@ -185,11 +186,7 @@ public class SysUser extends BaseEntity {
 
     @ApiModelProperty(value = "是否管理员")
     public boolean isAdmin() {
-        return isAdmin(this.userId);
+        return UserConstants.ADMIN_ID.equals(this.userId);
-    }
-
-    public static boolean isAdmin(Long userId) {
-        return userId != null && 1L == userId;
     }
 
 }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/UserConstants.java

@@ -1,114 +1,119 @@
-package com.ruoyi.common.core.constant;
+package com.ruoyi.common.core.constant;
-
+
-/**
+/**
- * 用户常量信息
+ * 用户常量信息
- *
+ *
- * @author ruoyi
+ * @author ruoyi
- */
+ */
-public interface UserConstants {
+public interface UserConstants {
-    /**
+    /**
-     * 平台内系统用户的唯一标志
+     * 平台内系统用户的唯一标志
-     */
+     */
-    String SYS_USER = "SYS_USER";
+    String SYS_USER = "SYS_USER";
-
+
-    /**
+    /**
-     * 正常状态
+     * 正常状态
-     */
+     */
-    String NORMAL = "0";
+    String NORMAL = "0";
-
+
-    /**
+    /**
-     * 异常状态
+     * 异常状态
-     */
+     */
-    String EXCEPTION = "1";
+    String EXCEPTION = "1";
-
+
-    /**
+    /**
-     * 用户封禁状态
+     * 用户封禁状态
-     */
+     */
-    String USER_DISABLE = "1";
+    String USER_DISABLE = "1";
-
+
-    /**
+    /**
-     * 角色封禁状态
+     * 角色封禁状态
-     */
+     */
-    String ROLE_DISABLE = "1";
+    String ROLE_DISABLE = "1";
-
+
-    /**
+    /**
-     * 部门正常状态
+     * 部门正常状态
-     */
+     */
-    String DEPT_NORMAL = "0";
+    String DEPT_NORMAL = "0";
-
+
-    /**
+    /**
-     * 部门停用状态
+     * 部门停用状态
-     */
+     */
-    String DEPT_DISABLE = "1";
+    String DEPT_DISABLE = "1";
-
+
-    /**
+    /**
-     * 字典正常状态
+     * 字典正常状态
-     */
+     */
-    String DICT_NORMAL = "0";
+    String DICT_NORMAL = "0";
-
+
-    /**
+    /**
-     * 是否为系统默认（是）
+     * 是否为系统默认（是）
-     */
+     */
-    String YES = "Y";
+    String YES = "Y";
-
+
-    /**
+    /**
-     * 是否菜单外链（是）
+     * 是否菜单外链（是）
-     */
+     */
-    String YES_FRAME = "0";
+    String YES_FRAME = "0";
-
+
-    /**
+    /**
-     * 是否菜单外链（否）
+     * 是否菜单外链（否）
-     */
+     */
-    String NO_FRAME = "1";
+    String NO_FRAME = "1";
-
+
-    /**
+    /**
-     * 菜单类型（目录）
+     * 菜单类型（目录）
-     */
+     */
-    String TYPE_DIR = "M";
+    String TYPE_DIR = "M";
-
+
-    /**
+    /**
-     * 菜单类型（菜单）
+     * 菜单类型（菜单）
-     */
+     */
-    String TYPE_MENU = "C";
+    String TYPE_MENU = "C";
-
+
-    /**
+    /**
-     * 菜单类型（按钮）
+     * 菜单类型（按钮）
-     */
+     */
-    String TYPE_BUTTON = "F";
+    String TYPE_BUTTON = "F";
-
+
-    /**
+    /**
-     * Layout组件标识
+     * Layout组件标识
-     */
+     */
-    String LAYOUT = "Layout";
+    String LAYOUT = "Layout";
-
+
-    /**
+    /**
-     * ParentView组件标识
+     * ParentView组件标识
-     */
+     */
-    String PARENT_VIEW = "ParentView";
+    String PARENT_VIEW = "ParentView";
-
+
-    /**
+    /**
-     * InnerLink组件标识
+     * InnerLink组件标识
-     */
+     */
-    String INNER_LINK = "InnerLink";
+    String INNER_LINK = "InnerLink";
-
+
-    /**
+    /**
-     * 校验返回结果码
+     * 校验返回结果码
-     */
+     */
-    String UNIQUE = "0";
+    String UNIQUE = "0";
-
+
-    String NOT_UNIQUE = "1";
+    String NOT_UNIQUE = "1";
-
+
-    /**
+    /**
-     * 用户名长度限制
+     * 用户名长度限制
-     */
+     */
-    int USERNAME_MIN_LENGTH = 2;
+    int USERNAME_MIN_LENGTH = 2;
-
+
-    int USERNAME_MAX_LENGTH = 20;
+    int USERNAME_MAX_LENGTH = 20;
-
+
-    /**
+    /**
-     * 密码长度限制
+     * 密码长度限制
-     */
+     */
-    int PASSWORD_MIN_LENGTH = 5;
+    int PASSWORD_MIN_LENGTH = 5;
-
+
-    int PASSWORD_MAX_LENGTH = 20;
+    int PASSWORD_MAX_LENGTH = 20;
-}
+
+    /**
+     * 管理员ID
+     */
+    Long ADMIN_ID = 1L;
+}

ruoyi-common/ruoyi-common-satoken/src/main/java/com/ruoyi/common/satoken/utils/LoginHelper.java

@@ -2,6 +2,7 @@ package com.ruoyi.common.satoken.utils;
 
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.ruoyi.common.core.constant.UserConstants;
 import com.ruoyi.common.core.enums.DeviceType;
 import com.ruoyi.common.core.enums.UserType;
 import com.ruoyi.common.core.exception.UtilException;
@@ -125,12 +126,11 @@ public class LoginHelper {
      * @return 结果
      */
     public static boolean isAdmin(Long userId) {
-        return userId != null && 1L == userId;
+        return UserConstants.ADMIN_ID.equals(userId);
     }
 
     public static boolean isAdmin() {
-        Long userId = getUserId();
+        return isAdmin(getUserId());
-        return userId != null && 1L == userId;
     }
 
 }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java

@@ -133,7 +133,7 @@ public class SysUserController extends BaseController {
         userService.checkUserDataScope(userId);
         Map<String, Object> ajax = new HashMap<>();
         List<SysRole> roles = roleService.selectRoleAll();
-        ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
+        ajax.put("roles", LoginHelper.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
         ajax.put("posts", postService.selectPostAll());
         if (ObjectUtil.isNotNull(userId)) {
             SysUser sysUser = userService.selectUserById(userId);
@@ -237,7 +237,7 @@ public class SysUserController extends BaseController {
         SysUser user = userService.selectUserById(userId);
         List<SysRole> roles = roleService.selectRolesByUserId(userId);
         ajax.put("user", user);
-        ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
+        ajax.put("roles", LoginHelper.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
         return R.ok(ajax);
     }
 

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java

@@ -152,7 +152,7 @@ public class SysDeptServiceImpl implements ISysDeptService {
      */
     @Override
     public void checkDeptDataScope(Long deptId) {
-        if (!SysUser.isAdmin(LoginHelper.getUserId())) {
+        if (!LoginHelper.isAdmin()) {
             SysDept dept = new SysDept();
             dept.setDeptId(deptId);
             List<SysDept> depts = SpringUtils.getAopProxy(this).selectDeptList(dept);

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java

@@ -10,7 +10,6 @@ import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.utils.TreeBuildUtils;
 import com.ruoyi.common.satoken.utils.LoginHelper;
 import com.ruoyi.system.api.domain.SysRole;
-import com.ruoyi.system.api.domain.SysUser;
 import com.ruoyi.system.domain.SysMenu;
 import com.ruoyi.system.domain.SysRoleMenu;
 import com.ruoyi.system.domain.vo.MetaVo;
@@ -58,7 +57,7 @@ public class SysMenuServiceImpl implements ISysMenuService {
     public List<SysMenu> selectMenuList(SysMenu menu, Long userId) {
         List<SysMenu> menuList = null;
         // 管理员显示所有菜单信息
-        if (SysUser.isAdmin(userId)) {
+        if (LoginHelper.isAdmin(userId)) {
             menuList = baseMapper.selectList(new LambdaQueryWrapper<SysMenu>()
                 .like(StringUtils.isNotBlank(menu.getMenuName()), SysMenu::getMenuName, menu.getMenuName())
                 .eq(StringUtils.isNotBlank(menu.getVisible()), SysMenu::getVisible, menu.getVisible())

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java

@@ -1,6 +1,6 @@
 package com.ruoyi.system.service.impl;
 
-import com.ruoyi.system.api.domain.SysUser;
+import com.ruoyi.common.satoken.utils.LoginHelper;
 import com.ruoyi.system.service.ISysMenuService;
 import com.ruoyi.system.service.ISysPermissionService;
 import com.ruoyi.system.service.ISysRoleService;
@@ -27,7 +27,7 @@ public class SysPermissionServiceImpl implements ISysPermissionService {
     public Set<String> getRolePermission(Long userId) {
         Set<String> roles = new HashSet<String>();
         // 管理员拥有所有权限
-        if (SysUser.isAdmin(userId)) {
+        if (LoginHelper.isAdmin(userId)) {
             roles.add("admin");
         } else {
             roles.addAll(roleService.selectRolePermissionByUserId(userId));
@@ -45,7 +45,7 @@ public class SysPermissionServiceImpl implements ISysPermissionService {
     public Set<String> getMenuPermission(Long userId) {
         Set<String> perms = new HashSet<String>();
         // 管理员拥有所有权限
-        if (SysUser.isAdmin(userId)) {
+        if (LoginHelper.isAdmin(userId)) {
             perms.add("*:*:*");
         } else {
             perms.addAll(menuService.selectMenuPermsByUserId(userId));

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java

@@ -11,7 +11,6 @@ import com.ruoyi.common.mybatis.core.page.PageQuery;
 import com.ruoyi.common.mybatis.core.page.TableDataInfo;
 import com.ruoyi.common.satoken.utils.LoginHelper;
 import com.ruoyi.system.api.domain.SysRole;
-import com.ruoyi.system.api.domain.SysUser;
 import com.ruoyi.system.domain.SysRoleDept;
 import com.ruoyi.system.domain.SysRoleMenu;
 import com.ruoyi.system.domain.SysUserRole;
@@ -181,7 +180,7 @@ public class SysRoleServiceImpl implements ISysRoleService {
      */
     @Override
     public void checkRoleDataScope(Long roleId) {
-        if (!SysUser.isAdmin(LoginHelper.getUserId())) {
+        if (!LoginHelper.isAdmin()) {
             SysRole role = new SysRole();
             role.setRoleId(roleId);
             List<SysRole> roles = SpringUtils.getAopProxy(this).selectRoleList(role);

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -207,7 +207,7 @@ public class SysUserServiceImpl implements ISysUserService {
      */
     @Override
     public void checkUserDataScope(Long userId) {
-        if (!SysUser.isAdmin(LoginHelper.getUserId())) {
+        if (!LoginHelper.isAdmin()) {
             SysUser user = new SysUser();
             user.setUserId(userId);
             List<SysUser> users = SpringUtils.getAopProxy(this).selectUserList(user);