From ddc8f14f593a23b62bafd6d23983da0e2d5d4e07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B9=E6=B3=A1=E6=B3=A1=E7=9A=84=E5=9B=A2=E5=AD=90?=
 <baoxinyi_i@didiglobal.com>
Date: Sun, 29 Oct 2023 19:29:31 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9AtenantList?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../console/src/layout/components/Navbar.vue     | 16 ++++++++++++----
 .../console/src/views/hippo4j/instance/index.vue |  4 ++++
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/threadpool/console/src/layout/components/Navbar.vue b/threadpool/console/src/layout/components/Navbar.vue
index e3033c5f..b116e9d1 100755
--- a/threadpool/console/src/layout/components/Navbar.vue
+++ b/threadpool/console/src/layout/components/Navbar.vue
@@ -87,7 +87,7 @@
       tenantInfo(newVal) {
         this.tenant.tenantId = newVal.tenantId
         this.tenant.resource = newVal.resource
-        console.log("ischangLang", newVal)
+        console.log("ischangLang", newVal, this.tenantList)
       }
     },
     methods: {
@@ -106,6 +106,7 @@
         .getCurrentUser(userName)
         .then((response) => {
           const { resources } = response;
+        console.log("isTenList1", resources, this.tenantList)
           if (response.role == 'ROLE_ADMIN') {
             resources.unshift({
               action: "rw",
@@ -115,15 +116,22 @@
               index: 0,
             })
           }
-          const resourcesRes = resources.map((item, index) => ({
-            ...item,
+        console.log("isTenList1111111", this.$t('common.allTenant'), resources, this.tenantList)
+          const resourcesRes = resources.map((item, index) => {
+            let query = {
+              ...item,
             tenantId: item.resource,
             index: index,
-          }))
+            }
+            console.log("=============", index, query, item)
+            return query
+        })
+        console.log("isTenList22222", resourcesRes, this.tenantList)
           this.$store.dispatch('tenant/setTenantList', resourcesRes)
           this.tenant = JSON.parse(this.$cookie.get('tenantInfo')) || resourcesRes[0]
           this.$store.dispatch('tenant/setTenantInfo', this.tenant || resourcesRes[0])
           this.$cookie.set('tenantInfo', JSON.stringify(this.tenant));
+        console.log("isTenList2", this.tenantList)
         })
         .catch(() => {});
         
diff --git a/threadpool/console/src/views/hippo4j/instance/index.vue b/threadpool/console/src/views/hippo4j/instance/index.vue
index 30897019..456757de 100755
--- a/threadpool/console/src/views/hippo4j/instance/index.vue
+++ b/threadpool/console/src/views/hippo4j/instance/index.vue
@@ -584,6 +584,9 @@ export default {
   created() {
     // this.fetchData()
     // 初始化项目
+      this.listQuery.tenantId = this?.tenantInfo?.tenantId || this.listQuery.tenantId
+      let isAllTenant = this.listQuery.tenantId == i18nConfig.messages.zh.common.allTenant || this.listQuery.tenantId == i18nConfig.messages.en.common.allTenant
+      this.listQuery.tenantId = isAllTenant ? '' : this.listQuery.tenantId
     this.tenantSelectList();
   },
   methods: {
@@ -819,6 +822,7 @@ export default {
       this.itemOptions = [];
       this.threadPoolOptions = [];
       const tenantId = { tenantId: this.listQuery.tenantId, size: this.size };
+      console.log("XXXXXXXXXXXXXXX", tenantId)
       itemApi
         .list(tenantId)
         .then((response) => {