From ecb53f27bcea639c316357a307e781f3395c2264 Mon Sep 17 00:00:00 2001
From: zhuxinru <zhuxinru@honeycombis.com>
Date: Wed, 24 Dec 2025 11:40:29 +0800
Subject: [PATCH] =?UTF-8?q?cid=E6=96=B0=E6=B3=A8=E5=86=8C=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=89=8D=E7=AB=AF=E4=BC=A0=E7=9A=84=E6=98=AFnull?=
 =?UTF-8?q?=E5=AD=97=E7=AC=A6=E4=B8=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../honeycom/common/data/tenant/TenantContextHolderFilter.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/honeycom-common/honeycom-common-data/src/main/java/com/honeycombis/honeycom/common/data/tenant/TenantContextHolderFilter.java b/honeycom-common/honeycom-common-data/src/main/java/com/honeycombis/honeycom/common/data/tenant/TenantContextHolderFilter.java
index 530e285..568c1c1 100644
--- a/honeycom-common/honeycom-common-data/src/main/java/com/honeycombis/honeycom/common/data/tenant/TenantContextHolderFilter.java
+++ b/honeycom-common/honeycom-common-data/src/main/java/com/honeycombis/honeycom/common/data/tenant/TenantContextHolderFilter.java
@@ -64,7 +64,7 @@ public class TenantContextHolderFilter extends GenericFilterBean {
 
 		log.info("获取header中的租户ID为:{}", headerTenantId);
 
-		if (StrUtil.isNotBlank(headerTenantId) && !StrUtil.equals(UNDEFINED_STR, headerTenantId)) {
+		if (StrUtil.isNotBlank(headerTenantId) && !StrUtil.equals(UNDEFINED_STR, headerTenantId) && !StrUtil.equals("null", headerTenantId)) {
 			TenantContextHolder.setTenantId(Long.parseLong(headerTenantId));
 		}
 		else if (StrUtil.isNotBlank(paramTenantId) && !StrUtil.equals(UNDEFINED_STR, paramTenantId)) {