|
@@ -779,14 +779,21 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
|
|
|
|
|
|
@Override
|
|
|
public void saveTenantContextHolder(HttpServletRequest request) {
|
|
|
- String tenantId = request.getHeader("tenantId");
|
|
|
- if (StringUtils.isEmpty(tenantId)) {
|
|
|
+
|
|
|
+ final String TENANT_ID = "tenantId";
|
|
|
+ String tenantId = request.getParameter(TENANT_ID);
|
|
|
+
|
|
|
+ if(StringUtils.isBlank(tenantId)){
|
|
|
+ tenantId = request.getHeader(TENANT_ID);
|
|
|
+ }
|
|
|
+
|
|
|
+ if (StringUtils.isBlank(tenantId)) {
|
|
|
SysUser sysUser = sysUserFeignService.queryUserInfo();
|
|
|
if (sysUser != null && sysUser.getTenantId() != null) {
|
|
|
tenantId = sysUser.getTenantId().toString();
|
|
|
}
|
|
|
}
|
|
|
- if (StringUtils.isNotEmpty(tenantId)) {
|
|
|
+ if (StringUtils.isNotBlank(tenantId)) {
|
|
|
TenantContextHolder.setTenantId(Integer.parseInt(tenantId));
|
|
|
if (Integer.parseInt(tenantId) != -1) {
|
|
|
log.info("==> " + request.getRequestURL());
|