From 90f667ca7256b0360e369c7b49ca1877f33a5d85 Mon Sep 17 00:00:00 2001 From: v-lijf43 <3067418132@qq.com> Date: Thu, 16 Oct 2025 16:33:30 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=B7=BB=E5=8A=A0=E8=B1=AA=E7=94=9F?= =?UTF-8?q?=E9=85=92=E5=BA=97=E8=BF=90=E8=90=A5=E9=83=A8=E5=80=BC=E7=8F=AD?= =?UTF-8?q?=E7=94=B5=E8=AF=9D=E8=B4=A6=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mh/common/constant/Constants.java | 2 ++ .../main/java/com/mh/common/core/domain/entity/SysRole.java | 2 +- .../main/java/com/mh/common/core/domain/entity/SysUser.java | 2 +- .../src/main/java/com/mh/common/utils/SecurityUtils.java | 6 ++++-- .../com/mh/framework/web/service/PermissionService.java | 4 +++- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/mh-common/src/main/java/com/mh/common/constant/Constants.java b/mh-common/src/main/java/com/mh/common/constant/Constants.java index 2a741a2..81da8a3 100644 --- a/mh-common/src/main/java/com/mh/common/constant/Constants.java +++ b/mh-common/src/main/java/com/mh/common/constant/Constants.java @@ -80,6 +80,8 @@ public class Constants { */ public static final String SUPER_ADMIN = "mhtech"; + public static final String SUPER_ADMIN_TWO = "18675333710"; + /** * 角色权限分隔符 */ diff --git a/mh-common/src/main/java/com/mh/common/core/domain/entity/SysRole.java b/mh-common/src/main/java/com/mh/common/core/domain/entity/SysRole.java index 04fba68..4ea94ec 100644 --- a/mh-common/src/main/java/com/mh/common/core/domain/entity/SysRole.java +++ b/mh-common/src/main/java/com/mh/common/core/domain/entity/SysRole.java @@ -91,7 +91,7 @@ public class SysRole extends BaseEntity public static boolean isAdmin(Long roleId) { - return roleId != null && 1L == roleId; + return roleId != null && (1L == roleId || 10005L == roleId); } @NotBlank(message = "角色名称不能为空") diff --git a/mh-common/src/main/java/com/mh/common/core/domain/entity/SysUser.java b/mh-common/src/main/java/com/mh/common/core/domain/entity/SysUser.java index da45ae8..6048f21 100644 --- a/mh-common/src/main/java/com/mh/common/core/domain/entity/SysUser.java +++ b/mh-common/src/main/java/com/mh/common/core/domain/entity/SysUser.java @@ -121,7 +121,7 @@ public class SysUser extends BaseEntity public static boolean isAdmin(Long userId) { - return userId != null && 1L == userId; + return userId != null && (1L == userId || 10005L == userId); } public Long getDeptId() diff --git a/mh-common/src/main/java/com/mh/common/utils/SecurityUtils.java b/mh-common/src/main/java/com/mh/common/utils/SecurityUtils.java index 36c7a5d..6c90088 100644 --- a/mh-common/src/main/java/com/mh/common/utils/SecurityUtils.java +++ b/mh-common/src/main/java/com/mh/common/utils/SecurityUtils.java @@ -102,7 +102,7 @@ public class SecurityUtils { * @return 结果 */ public static boolean isAdmin(Long userId) { - return userId != null && 1L == userId; + return userId != null && (1L == userId ||10005L == userId); } /** @@ -148,7 +148,9 @@ public class SecurityUtils { */ public static boolean hasRole(Collection roles, String role) { return roles.stream().filter(StringUtils::hasText) - .anyMatch(x -> Constants.SUPER_ADMIN.equals(x) || PatternMatchUtils.simpleMatch(x, role)); + .anyMatch(x -> Constants.SUPER_ADMIN.equals(x) + || Constants.SUPER_ADMIN_TWO.equals(x) + || PatternMatchUtils.simpleMatch(x, role)); } } diff --git a/mh-framework/src/main/java/com/mh/framework/web/service/PermissionService.java b/mh-framework/src/main/java/com/mh/framework/web/service/PermissionService.java index c867ac7..5d06483 100644 --- a/mh-framework/src/main/java/com/mh/framework/web/service/PermissionService.java +++ b/mh-framework/src/main/java/com/mh/framework/web/service/PermissionService.java @@ -86,7 +86,9 @@ public class PermissionService { } for (SysRole sysRole : loginUser.getUser().getRoles()) { String roleKey = sysRole.getRoleKey(); - if (Constants.SUPER_ADMIN.equals(roleKey) || roleKey.equals(StringUtils.trim(role))) { + if (Constants.SUPER_ADMIN.equals(roleKey) + || Constants.SUPER_ADMIN_TWO.equals(roleKey) + || roleKey.equals(StringUtils.trim(role))) { return true; } }