From 35d01bc4ea40b78c3ea6ae9bf8a2db69d84d296d Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Wed, 18 May 2022 22:12:29 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=91=88=20=E9=87=8D=E6=9E=84=E5=AE=89?=
 =?UTF-8?q?=E5=85=A8=E6=A1=86=E6=9E=B6=E5=BA=95=E5=B1=82=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=BD=93=E5=89=8D=E7=94=A8=E6=88=B7=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/cloud/kicc/system/api/entity/Tenant.java  |  7 +++++++
 .../cloud/kicc/system/controller/TenantController.java | 10 +---------
 .../default/setting/components/TenantSelect.vue        |  2 +-
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Tenant.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Tenant.java
index 9df05a52..4669384d 100644
--- a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Tenant.java
+++ b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Tenant.java
@@ -1,5 +1,6 @@
 package com.cloud.kicc.system.api.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.cloud.kicc.common.data.entity.CommonEntity;
@@ -54,4 +55,10 @@ public class Tenant  extends CommonEntity {
      */
     private String status;
 
+    /**
+     * 查询条件,多租户ids
+     */
+    @TableField(exist = false)
+    private String[] tenantIds;
+
 }
diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/TenantController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/TenantController.java
index 7bb437b2..bf6f23ef 100644
--- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/TenantController.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/TenantController.java
@@ -3,22 +3,13 @@ package com.cloud.kicc.system.controller;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.cloud.kicc.common.core.api.R;
 import com.cloud.kicc.common.core.constant.AppConstants;
-import com.cloud.kicc.common.core.constant.CacheConstants;
-import com.cloud.kicc.common.core.constant.SecurityConstants;
 import com.cloud.kicc.common.log.annotation.SysLog;
-import com.cloud.kicc.common.security.annotation.Inner;
-import com.cloud.kicc.system.api.entity.DictData;
 import com.cloud.kicc.system.api.entity.Tenant;
-import com.cloud.kicc.system.api.feign.RemoteDictService;
-import com.cloud.kicc.system.service.DictDataService;
 import com.cloud.kicc.system.service.TenantService;
-import lombok.AllArgsConstructor;
 import lombok.RequiredArgsConstructor;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
@@ -41,6 +32,7 @@ public class TenantController {
 
     private LambdaQueryWrapper<Tenant> getQueryWrapper(Tenant tenant) {
         return new LambdaQueryWrapper<Tenant>()
+                .in(StrUtil.isNotBlank(tenant.getCode()), Tenant::getCode, tenant.getTenantIds())
                 .like(StrUtil.isNotBlank(tenant.getName()), Tenant::getName, tenant.getName())
                 .eq(StrUtil.isNotBlank(tenant.getCode()), Tenant::getCode, tenant.getCode())
                 .eq(StrUtil.isNotBlank(tenant.getStatus()), Tenant::getStatus, tenant.getStatus());
diff --git a/kicc-ui/src/layouts/default/setting/components/TenantSelect.vue b/kicc-ui/src/layouts/default/setting/components/TenantSelect.vue
index f418fe83..d2ae73d2 100644
--- a/kicc-ui/src/layouts/default/setting/components/TenantSelect.vue
+++ b/kicc-ui/src/layouts/default/setting/components/TenantSelect.vue
@@ -70,9 +70,9 @@
   });
 
   onMounted(async () => {
-    const result = await listTenant();
     const userStore = useUserStore();
     state.modelRef.tenantIds = userStore.getUserInfo.tenantIds;
+    const result = await listTenant({ tenantIds: state.modelRef.tenantIds });
     state.options = result.data.map(tenant => ({
       value: tenant.code,
       label: tenant.name