From 6a412f27c6bb9ce3bedf89a5d552916f0b2c82f2 Mon Sep 17 00:00:00 2001
From: zlyx <1242874891@qq.com>
Date: Thu, 30 Mar 2023 10:02:25 +0800
Subject: [PATCH] =?UTF-8?q?update=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?=E4=BC=98=E5=8C=96=E7=A7=9F=E6=88=B7=E5=BC=80=E5=85=B3=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E9=80=BB=E8=BE=91=20;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 4ec2e28..6576c8c 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -117,8 +117,10 @@ function dynamicClearEvent() {
 function initTenantList() {
   getTenantList().then(res => {
     const vo = res.data;
-    tenantList.value = vo.voList;
     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 4ec8ec4..56f0086 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -157,11 +157,13 @@ function getCode() {
 function initTenantList() {
   getTenantList().then(res => {
     const vo = res.data;
-    tenantList.value = vo.voList;
-    if (tenantList.value != null && tenantList.value.length !== 0) {
-      loginForm.value.tenantId = tenantList.value[0].tenantId;
-    }
     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 4f18274..577a6e5 100644
--- a/src/views/register.vue
+++ b/src/views/register.vue
@@ -173,11 +173,13 @@ function getCode() {
 function initTenantList() {
   getTenantList().then(res => {
     const vo = res.data;
-    tenantList.value = vo.voList;
-    if (tenantList.value != null && tenantList.value.length !== 0) {
-      loginForm.value.tenantId = tenantList.value[0].tenantId;
-    }
     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;
+      }
+    }
   });
 }