diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 4972956281f41013f7218b303051ccd6294f84bb..6576c8c34bd9d3eecb5b7f17b510278fab6ad782 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -11,7 +11,7 @@
                    filterable
                    reserve-keyword
                    placeholder="请选择租户"
-                   v-if="userId === 1"
+                   v-if="userId === 1 && tenantEnabled"
                    @change="dynamicTenantEvent"
                    @clear="dynamicClearEvent">
           <el-option
@@ -91,6 +91,8 @@ const companyName = ref(undefined);
 const tenantList = ref([]);
 // 是否切换了租户
 const dynamic = ref(false);
+// 租户开关
+const tenantEnabled = ref(true);
 
 // 动态切换
 function dynamicTenantEvent(tenantId) {
@@ -114,7 +116,11 @@ function dynamicClearEvent() {
 // 租户列表
 function initTenantList() {
   getTenantList().then(res => {
-    tenantList.value = res.data;
+    const vo = res.data;
+    tenantEnabled.value = vo.tenantEnabled === undefined ? true : vo.tenantEnabled;
+    if (tenantEnabled.value) {
+        tenantList.value = vo.voList;
+    }
   });
 }
 
diff --git a/src/views/login.vue b/src/views/login.vue
index ad58ef01062f9dd2e94b899f5d1d7b55d80c2562..56f00865ec53cd820f02322a681d75d7d985f45d 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -2,7 +2,7 @@
   <div class="login">
     <el-form ref="loginRef" :model="loginForm" :rules="loginRules" class="login-form">
       <h3 class="title">RuoYi-Vue-Plus多租户管理系统</h3>
-      <el-form-item prop="tenantId">
+      <el-form-item prop="tenantId" v-if="tenantEnabled">
         <el-select v-model="loginForm.tenantId" filterable placeholder="请选择/输入公司名称" style="width: 100%">
           <el-option
               v-for="item in tenantList"
@@ -110,6 +110,8 @@ const register = ref(false);
 const redirect = ref(undefined);
 // 租户列表
 const tenantList = ref([]);
+// 租户开关
+const tenantEnabled = ref(true);
 
 function handleLogin() {
   proxy.$refs.loginRef.validate(valid => {
@@ -154,9 +156,13 @@ function getCode() {
 
 function initTenantList() {
   getTenantList().then(res => {
-    tenantList.value = res.data;
-    if (tenantList.value != null && tenantList.value.length !== 0) {
-      loginForm.value.tenantId = tenantList.value[0].tenantId;
+    const vo = res.data;
+    tenantEnabled.value = vo.tenantEnabled === undefined ? true : vo.tenantEnabled;
+    if (tenantEnabled.value) {
+      tenantList.value = vo.voList;
+      if (tenantList.value != null && tenantList.value.length !== 0) {
+        loginForm.value.tenantId = tenantList.value[0].tenantId;
+      }
     }
   });
 }
diff --git a/src/views/register.vue b/src/views/register.vue
index 731f5bb9e8ac790a5bb3193a621810cb8068fb2a..577a6e582fe3b12290183b169e5d3d68178f7477 100644
--- a/src/views/register.vue
+++ b/src/views/register.vue
@@ -2,7 +2,7 @@
   <div class="register">
     <el-form ref="registerRef" :model="registerForm" :rules="registerRules" class="register-form">
       <h3 class="title">RuoYi-Vue-Plus多租户管理系统</h3>
-      <el-form-item prop="tenantId">
+      <el-form-item prop="tenantId"  v-if="tenantEnabled">
         <el-select v-model="registerForm.tenantId" filterable placeholder="请选择/输入公司名称" style="width: 100%">
           <el-option
               v-for="item in tenantList"
@@ -135,6 +135,8 @@ const loading = ref(false);
 const captchaEnabled = ref(true);
 // 租户列表
 const tenantList = ref([]);
+// 租户开关
+const tenantEnabled = ref(true);
 
 function handleRegister() {
   proxy.$refs.registerRef.validate(valid => {
@@ -170,9 +172,13 @@ function getCode() {
 
 function initTenantList() {
   getTenantList().then(res => {
-    tenantList.value = res.data;
-    if (tenantList.value != null && tenantList.value.length !== 0) {
-      loginForm.value.tenantId = tenantList.value[0].tenantId;
+    const vo = res.data;
+    tenantEnabled.value = vo.tenantEnabled === undefined ? true : vo.tenantEnabled;
+    if (tenantEnabled.value) {
+      tenantList.value = vo.voList;
+      if (tenantList.value != null && tenantList.value.length !== 0) {
+          loginForm.value.tenantId = tenantList.value[0].tenantId;
+      }
     }
   });
 }