From 61a6cac71469442dbd923b0047ceda55940e7bb3 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Thu, 14 Aug 2025 22:31:28 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=AE=80=E5=8C=96=E5=91=BD?= =?UTF-8?q?=E5=90=8D=20isSuperAdminUser()=20=3D>=20isSuperAdmin(),=20isTen?= =?UTF-8?q?antAdminUser()=20=3D>=20isTenantAdmin()?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DefaultDataPermissionUserDataProvider.java | 2 +- .../continew/admin/common/context/UserContext.java | 8 ++++---- .../admin/common/context/UserContextHolder.java | 12 ++++++------ 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/continew-common/src/main/java/top/continew/admin/common/config/mybatis/DefaultDataPermissionUserDataProvider.java b/continew-common/src/main/java/top/continew/admin/common/config/mybatis/DefaultDataPermissionUserDataProvider.java index eafd0ec0..9131143e 100644 --- a/continew-common/src/main/java/top/continew/admin/common/config/mybatis/DefaultDataPermissionUserDataProvider.java +++ b/continew-common/src/main/java/top/continew/admin/common/config/mybatis/DefaultDataPermissionUserDataProvider.java @@ -34,7 +34,7 @@ public class DefaultDataPermissionUserDataProvider implements DataPermissionUser @Override public boolean isFilter() { - return !UserContextHolder.isSuperAdminUser() && !UserContextHolder.isTenantAdminUser(); + return !UserContextHolder.isSuperAdmin() && !UserContextHolder.isTenantAdmin(); } @Override diff --git a/continew-common/src/main/java/top/continew/admin/common/context/UserContext.java b/continew-common/src/main/java/top/continew/admin/common/context/UserContext.java index 2f71e326..ecade1a8 100644 --- a/continew-common/src/main/java/top/continew/admin/common/context/UserContext.java +++ b/continew-common/src/main/java/top/continew/admin/common/context/UserContext.java @@ -132,11 +132,11 @@ public class UserContext implements Serializable { } /** - * 是否为超级管理员用户 + * 是否为超级管理员 * * @return true：是；false：否 */ - public boolean isSuperAdminUser() { + public boolean isSuperAdmin() { if (CollUtil.isEmpty(roleCodes)) { return false; } @@ -144,11 +144,11 @@ public class UserContext implements Serializable { } /** - * 是否为租户管理员用户 + * 是否为租户管理员 * * @return true：是；false：否 */ - public boolean isTenantAdminUser() { + public boolean isTenantAdmin() { if (CollUtil.isEmpty(roleCodes)) { return false; } diff --git a/continew-common/src/main/java/top/continew/admin/common/context/UserContextHolder.java b/continew-common/src/main/java/top/continew/admin/common/context/UserContextHolder.java index 92ec08d1..7eba7333 100644 --- a/continew-common/src/main/java/top/continew/admin/common/context/UserContextHolder.java +++ b/continew-common/src/main/java/top/continew/admin/common/context/UserContextHolder.java @@ -181,22 +181,22 @@ public class UserContextHolder { } /** - * 是否为超级管理员用户 + * 是否为超级管理员 * * @return true：是；false：否 */ - public static boolean isSuperAdminUser() { + public static boolean isSuperAdmin() { StpUtil.checkLogin(); - return getContext().isSuperAdminUser(); + return getContext().isSuperAdmin(); } /** - * 是否为租户管理员用户 + * 是否为租户管理员 * * @return true：是；false：否 */ - public static boolean isTenantAdminUser() { + public static boolean isTenantAdmin() { StpUtil.checkLogin(); - return getContext().isTenantAdminUser(); + return getContext().isTenantAdmin(); } }