From 49144fe6881c6c62288520ece869dbeec5c945ae Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Thu, 19 May 2022 00:26:54 +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

---
 .../com/cloud/kicc/system/controller/TenantController.java     | 3 ++-
 .../src/layouts/default/setting/components/TenantSelect.vue    | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

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 bf6f23ef..6c53c60c 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
@@ -1,5 +1,6 @@
 package com.cloud.kicc.system.controller;
 
+import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -32,7 +33,7 @@ public class TenantController {
 
     private LambdaQueryWrapper<Tenant> getQueryWrapper(Tenant tenant) {
         return new LambdaQueryWrapper<Tenant>()
-                .in(StrUtil.isNotBlank(tenant.getCode()), Tenant::getCode, tenant.getTenantIds())
+                .in(ArrayUtil.isNotEmpty(tenant.getTenantIds()), 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 0afe5992..75d9b6f1 100644
--- a/kicc-ui/src/layouts/default/setting/components/TenantSelect.vue
+++ b/kicc-ui/src/layouts/default/setting/components/TenantSelect.vue
@@ -5,7 +5,7 @@
   >
     <AFormItem name="tenantIds"
                style="margin-bottom:0px"
-               :rules="[{ required: true, message: '请至少选择一个多租户,不然会产生很多脏数据!'}]"
+               :rules="[{ required: true, message: '请至少选择一个多租户,否则会产生无租户数据!'}]"
     >
       <ASelect v-model:value="state.modelRef.tenantIds"
                :options="state.options"