From cdc8a819df5da7e57c88b50d4ce49d59b48f04d9 Mon Sep 17 00:00:00 2001
From: zy <82248909@qq.com>
Date: Wed, 18 Mar 2026 10:44:24 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=9F=E6=88=B7=E6=94=B9=E4=B8=BA=E4=BB=8Ehe?=
 =?UTF-8?q?ader=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../appmana/service/impl/CommonServiceImpl.java        | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/CommonServiceImpl.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/CommonServiceImpl.java
index 62f406f..ddcabf1 100644
--- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/CommonServiceImpl.java
+++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/CommonServiceImpl.java
@@ -196,8 +196,15 @@ public class CommonServiceImpl {
         if(StringUtils.isNotBlank(authId)){
             tenantId = authId;
         }else{
-            tenantId = CommonConstants.defaultTenant;
+            //个别controller中直接用了此方法
+            String hearderTenantId = HttpServletRequestUtil.getRequestInfo(CommonConstants.HEADER_TENANT_ID);
+            if(StringUtils.isNotBlank(hearderTenantId)){
+                tenantId =hearderTenantId;
+            }else{
+                tenantId = CommonConstants.defaultTenant;
+            }
         }
+        log.warn("当前租户1=============="+tenantId);
         TenantContext.setTenant(tenantId);//设置当前租户
         return tenantId;
     }
@@ -209,6 +216,7 @@ public class CommonServiceImpl {
             getTenantId(tenantId);
         }else{
             TenantContext.setTenant(CommonConstants.defaultTenant);//设置当前租户
+            log.warn("当前租户2=============="+CommonConstants.defaultTenant);
         }
 
     }