From befa87ba54890a6f1706a91d674a87829b92a382 Mon Sep 17 00:00:00 2001
From: zlyx <1242874891@qq.com>
Date: Thu, 30 Mar 2023 09:16:12 +0800
Subject: [PATCH 1/2] =?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?=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 | 8 ++++++--
 src/views/login.vue              | 8 ++++++--
 src/views/register.vue           | 8 ++++++--
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 49729562..4ec2e287 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,9 @@ function dynamicClearEvent() {
 // 租户列表
 function initTenantList() {
   getTenantList().then(res => {
-    tenantList.value = res.data;
+    const vo = res.data;
+    tenantList.value = vo.voList;
+    tenantEnabled.value = vo.tenantEnabled === undefined ? true : vo.tenantEnabled;
   });
 }
 
diff --git a/src/views/login.vue b/src/views/login.vue
index ad58ef01..4ec8ec44 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,10 +156,12 @@ function getCode() {
 
 function initTenantList() {
   getTenantList().then(res => {
-    tenantList.value = res.data;
+    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;
   });
 }
 
diff --git a/src/views/register.vue b/src/views/register.vue
index 731f5bb9..4f182744 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,10 +172,12 @@ function getCode() {
 
 function initTenantList() {
   getTenantList().then(res => {
-    tenantList.value = res.data;
+    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;
   });
 }
 
-- 
Gitee


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 2/2] =?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 4ec2e287..6576c8c3 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 4ec8ec44..56f00865 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 4f182744..577a6e58 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;
+      }
+    }
   });
 }
 
-- 
Gitee