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); } }