From 3333c42e2384770ec9607fcacc276fecd3c57ad9 Mon Sep 17 00:00:00 2001
From: MichelleChung <1242874891@qq.com>
Date: Thu, 30 Mar 2023 02:22:07 +0000
Subject: [PATCH] =?UTF-8?q?!2=20=E9=A1=B5=E9=9D=A2=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E7=A7=9F=E6=88=B7=E5=BC=80=E5=85=B3=E5=88=A4=E6=96=AD=20*=20up?=
 =?UTF-8?q?date=20=E6=9B=B4=E6=96=B0=20=E6=B3=A8=E5=86=8C/=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95/=E9=A1=B6=E9=83=A8=E6=A0=8F=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E7=A7=9F=E6=88=B7=E5=BC=80=E5=85=B3=E5=88=A4=E6=96=AD=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=20;=20*=20update=20=E6=9B=B4=E6=96=B0=20=E6=B3=A8?=
 =?UTF-8?q?=E5=86=8C/=E7=99=BB=E5=BD=95/=E9=A1=B6=E9=83=A8=E6=A0=8F=20?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=A7=9F=E6=88=B7=E5=BC=80=E5=85=B3=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=20;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Navbar.vue | 10 ++++++++--
 src/views/login.vue              | 14 ++++++++++----
 src/views/register.vue           | 14 ++++++++++----
 3 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 4972956..6576c8c 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 ad58ef0..56f0086 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 731f5bb..577a6e5 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;
+      }
     }
   });
 }