From 9b4e2c1011dae0812aff313578d8bdd6820d07b2 Mon Sep 17 00:00:00 2001
From: Vinjor <vinjorm@gmail.com>
Date: Thu, 1 Aug 2024 18:05:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E7=A7=9F=E6=88=B7=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=88=9B=E5=BB=BA=E7=A7=9F=E6=88=B7=E9=A1=B6=E7=BA=A7?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=EF=BC=8C=E6=9B=B4=E6=96=B0=E7=A7=9F=E6=88=B7?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=9B=B4=E6=96=B0=E9=A1=B6=E7=BA=A7=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E5=90=8D=E7=A7=B0=EF=BC=8C=E7=99=BB=E5=BD=95=E9=A1=B5?=
 =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=90=8E=E7=BC=80tenantCode=E5=80=BC?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E8=8E=B7=E5=8F=96=E7=99=BB=E5=BD=95=E7=A7=9F?=
 =?UTF-8?q?=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/tenant.js          | 11 +++++++++++
 src/views/base/company/index.vue  |  1 -
 src/views/login.vue               |  6 ++++--
 src/views/system/tenant/index.vue | 10 +++++-----
 4 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/api/system/tenant.js b/src/api/system/tenant.js
index bef02c5..90a6610 100644
--- a/src/api/system/tenant.js
+++ b/src/api/system/tenant.js
@@ -11,6 +11,17 @@ export function getTenantIdByName(name) {
   })
 }
 
+// 使用租户域名（标识），获得租户编号
+export function getTenantIdByWebsite(website) {
+  return request({
+    url: '/system/tenant/get-by-website',
+    method: 'get',
+    params: {
+      website
+    }
+  })
+}
+
 // 创建租户
 export function createTenant(data) {
   return request({
diff --git a/src/views/base/company/index.vue b/src/views/base/company/index.vue
index 4ef0712..8e7cef9 100644
--- a/src/views/base/company/index.vue
+++ b/src/views/base/company/index.vue
@@ -140,7 +140,6 @@ export default {
     /** 查询列表 */
     async getList() {
       try {
-        debugger
         this.loading = true
         const res = await CompanyApi.getCompanyPage(this.queryParams)
         this.list = res.data.records
diff --git a/src/views/login.vue b/src/views/login.vue
index 19e00cb..88f603a 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -110,7 +110,7 @@
 
 <script>
 import {sendSmsCode, socialAuthRedirect} from "@/api/login";
-import {getTenantIdByName} from "@/api/system/tenant";
+import {getTenantIdByWebsite,getTenantIdByName} from "@/api/system/tenant";
 import {SystemUserSocialTypeEnum} from "@/utils/constants";
 import {getCaptchaEnable, getTenantEnable} from "@/utils/ruoyi";
 import {
@@ -133,6 +133,7 @@ export default {
   },
   data() {
     return {
+      tenantCode:"lighting",
       codeUrl: "",
       //是否开启图形验证码
       captchaEnable: false,
@@ -199,7 +200,8 @@ export default {
     // 租户开关
     this.tenantEnable = getTenantEnable();
     if (this.tenantEnable) {
-      getTenantIdByName(this.loginForm.tenantName).then(res => { // 设置租户
+      this.tenantCode = this.$route.query.tenantCode; // John
+      getTenantIdByWebsite(this.tenantCode).then(res => { // 设置租户
         const tenantId = res.data;
         if (tenantId && tenantId >= 0) {
           setTenantId(tenantId)
diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue
index a65c498..a65e08f 100644
--- a/src/views/system/tenant/index.vue
+++ b/src/views/system/tenant/index.vue
@@ -63,7 +63,7 @@
           <span>{{ parseTime(scope.row.expireTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="绑定域名" align="center" prop="domain" width="180" />
+      <el-table-column label="绑定域名" align="center" prop="website" width="180" />
       <el-table-column label="租户状态" align="center" prop="status">
         <template v-slot="scope">
           <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status"/>
@@ -117,8 +117,8 @@
           <el-date-picker clearable size="small" v-model="form.expireTime" type="date"
                           value-format="timestamp" placeholder="请选择过期时间" />
         </el-form-item>
-        <el-form-item label="绑定域名" prop="domain">
-          <el-input v-model="form.domain" placeholder="请输入绑定域名" />
+        <el-form-item label="绑定域名" prop="website">
+          <el-input v-model="form.website" placeholder="请输入绑定域名" />
         </el-form-item>
         <el-form-item label="租户状态" prop="status">
           <el-radio-group v-model="form.status">
@@ -182,7 +182,7 @@ export default {
         status: [{ required: true, message: "租户状态不能为空", trigger: "blur" }],
         accountCount: [{ required: true, message: "账号额度不能为空", trigger: "blur" }],
         expireTime: [{ required: true, message: "过期时间不能为空", trigger: "blur" }],
-        domain: [{ required: true, message: "绑定域名不能为空", trigger: "blur" }],
+        website: [{ required: true, message: "绑定域名不能为空", trigger: "blur" }],
         username: [{ required: true, message: "用户名称不能为空", trigger: "blur" }],
         password: [{ required: true, message: "用户密码不能为空", trigger: "blur" }],
       }
@@ -221,7 +221,7 @@ export default {
         contactMobile: undefined,
         accountCount: undefined,
         expireTime: undefined,
-        domain: undefined,
+        website: undefined,
         status: CommonStatusEnum.ENABLE,
       };
       this.resetForm("form");