gxwebsoft/core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
b2894lxlx
2024-12-31 15:50:07 +08:00
parent e2ced994f3 9e1b6b1446
commit 166cdc3ed1
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/gxwebsoft/common/core/web/BaseController.java
View File

@@ -73,7 +73,12 @@ public class BaseController {
* @return tenantId * @return tenantId
*/ */
public Integer getTenantId() { public Integer getTenantId() {
// 1 从域名拿ID // 1 从登录用户拿tenantId
User loginUser = getLoginUser();
if (loginUser != null) {
return loginUser.getTenantId();
}
// 2 从域名拿ID
String Domain = request.getHeader("Domain"); String Domain = request.getHeader("Domain");
if (StrUtil.isNotBlank(Domain)) { if (StrUtil.isNotBlank(Domain)) {
String key = "Domain:" + Domain; String key = "Domain:" + Domain;
@@ -83,19 +88,15 @@ public class BaseController {
return Integer.valueOf(tenantId); return Integer.valueOf(tenantId);
} }
} }
// 2 从请求头拿ID // 3 从请求头拿ID
String tenantId = request.getHeader("tenantId"); String tenantId = request.getHeader("tenantId");
if(StrUtil.isNotBlank(tenantId)){ if(StrUtil.isNotBlank(tenantId)){
return Integer.valueOf(tenantId); return Integer.valueOf(tenantId);
} }
// 1 从登录用户拿tenantId
User loginUser = getLoginUser();
if (loginUser != null) {
return loginUser.getTenantId();
}
return null; return null;
} }
/** /**
* 获取当前登录的企业信息 * 获取当前登录的企业信息
* *