From ea8839b19616b86afb5db2eb681b10d5865d59eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?=
 <15040126243@163.com>
Date: Thu, 9 Feb 2023 14:19:40 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E7=A7=9F=E6=88=B7=E5=B8=B8=E9=87=8F=E5=91=BD=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/common/core/constant/TenantConstants.java    | 10 +++++-----
 .../com/ruoyi/common/core/constant/UserConstants.java  |  5 +++++
 .../system/service/impl/SysTenantServiceImpl.java      |  4 ++--
 3 files changed, 12 insertions(+), 7 deletions(-)

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);