From b4c38948eb08d89e4679451edd8ad302b458a8da Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Wed, 18 May 2022 11:29:07 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=91=A3=20=E4=BF=AE=E6=94=B9sql=E8=84=9A?=
 =?UTF-8?q?=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cloud/kicc/common/data/util/TenantContextHolder.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/kicc-common/kicc-common-data/src/main/java/com/cloud/kicc/common/data/util/TenantContextHolder.java b/kicc-common/kicc-common-data/src/main/java/com/cloud/kicc/common/data/util/TenantContextHolder.java
index 93ca321e..72ad129b 100644
--- a/kicc-common/kicc-common-data/src/main/java/com/cloud/kicc/common/data/util/TenantContextHolder.java
+++ b/kicc-common/kicc-common-data/src/main/java/com/cloud/kicc/common/data/util/TenantContextHolder.java
@@ -29,12 +29,17 @@ public class TenantContextHolder {
 	}
 
 	public String getTenant() {
-		String tenantIds = ObjectUtil.isNotEmpty(getUser()) ? getUser().getTenantId() : null;
+		String tenantIds = ObjectUtil.isNotEmpty(getUser()) ? getUser().getTenantId() : clearTenant();
 		return StrUtil.isNotBlank(contextHolder.get()) ? contextHolder.get() : tenantIds;
 	}
 
-	public void clearTenant() {
+	/**
+	 * 校验用户多租户是否为空,为空说明当前用户未登录,需要清除当前线程多租户数据
+	 * 不收的销毁,会出现 ThreadLocal 内存泄漏的问题
+	 */
+	public String clearTenant() {
 		contextHolder.remove();
+		return null;
 	}
 
 	/**