ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java
@@ -8,6 +8,7 @@ import com.ruoyi.common.core.annotation.Excel; import com.ruoyi.common.core.annotation.Excel.ColumnType; import com.ruoyi.common.core.annotation.Excel.Type; import com.ruoyi.common.core.constant.UserConstants; import com.ruoyi.common.core.annotation.Excels; import com.ruoyi.common.core.web.domain.BaseEntity; import com.ruoyi.common.core.xss.Xss; @@ -116,7 +117,7 @@ public static boolean isAdmin(Long userId) { return userId != null && 1L == userId; return UserConstants.isAdmin(userId); } public Long getDeptId() ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/UserConstants.java
@@ -80,4 +80,9 @@ public static final int PASSWORD_MIN_LENGTH = 5; public static final int PASSWORD_MAX_LENGTH = 20; public static boolean isAdmin(Long userId) { return userId != null && 1L == userId; } } ruoyi-common/ruoyi-common-sensitive/pom.xml
@@ -17,10 +17,10 @@ <dependencies> <!-- RuoYi Common Security --> <!-- RuoYi Common Core --> <dependency> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-common-security</artifactId> <artifactId>ruoyi-common-core</artifactId> </dependency> </dependencies> ruoyi-common/ruoyi-common-sensitive/src/main/java/com/ruoyi/common/sensitive/config/SensitiveJsonSerializer.java
@@ -8,10 +8,10 @@ import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.ser.ContextualSerializer; import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.common.core.constant.UserConstants; import com.ruoyi.common.core.context.SecurityContextHolder; import com.ruoyi.common.sensitive.annotation.Sensitive; import com.ruoyi.common.sensitive.enums.DesensitizedType; import com.ruoyi.system.api.model.LoginUser; /** * 数据脱敏序列化过滤 @@ -55,9 +55,9 @@ { try { LoginUser securityUser = SecurityUtils.getLoginUser(); Long userId = SecurityContextHolder.getUserId(); // 管理员不脱敏 return !securityUser.getSysUser().isAdmin(); return !UserConstants.isAdmin(userId); } catch (Exception e) {