diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/TenantConstants.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/TenantConstants.java index 9baf0138d..bdde0b7ec 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/TenantConstants.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/TenantConstants.java @@ -26,16 +26,16 @@ public interface TenantConstants { /** * 超级管理员ID */ - Long SUPER_ADMIN_ID = 1L; + Long TENANT_SUPER_ADMIN_ID = 1L; /** - * 管理员角色 roleKey + * 租户管理员角色 roleKey */ - String ADMIN_ROLE_KEY = "admin"; + String TENANT_ADMIN_ROLE_KEY = "admin"; /** - * 管理员角色名称 + * 租户管理员角色名称 */ - String ADMIN_ROLE_NAME = "管理员"; + String TENANT_ADMIN_ROLE_NAME = "管理员"; } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/UserConstants.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/UserConstants.java index f50e3096f..0318cb72a 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/UserConstants.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/UserConstants.java @@ -130,4 +130,9 @@ public interface UserConstants { int PASSWORD_MIN_LENGTH = 5; int PASSWORD_MAX_LENGTH = 20; + /** + * 超级管理员ID + */ + Long SUPER_ADMIN_ID = 1L; + } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantServiceImpl.java index 4121c9630..4a7193f9a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantServiceImpl.java @@ -192,8 +192,8 @@ public class SysTenantServiceImpl implements ISysTenantService { // 创建角色 SysRole role = new SysRole(); role.setTenantId(tenantId); - role.setRoleName(TenantConstants.ADMIN_ROLE_NAME); - role.setRoleKey(TenantConstants.ADMIN_ROLE_KEY); + role.setRoleName(TenantConstants.TENANT_ADMIN_ROLE_NAME); + role.setRoleKey(TenantConstants.TENANT_ADMIN_ROLE_KEY); role.setRoleSort(1); role.setStatus(TenantConstants.NORMAL); sysRoleMapper.insert(role);