opensource/RuoYi-Vue-Plus
2
0
Fork 1
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-09-20 10:13:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into future/flowable

Browse Source
This commit is contained in:
疯狂的狮子Li 2023-11-29 00:37:53 +08:00
commit e2ca080aea
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/helper/TenantHelper.java
View File

@ -167,6 +167,9 @@ public class TenantHelper {
* 获取当前租户id(动态租户优先) * 获取当前租户id(动态租户优先)
*/ */
public static String getTenantId() { public static String getTenantId() {
if (!isEnable()) {
return null;
}
String tenantId = TenantHelper.getDynamic(); String tenantId = TenantHelper.getDynamic();
if (StringUtils.isBlank(tenantId)) { if (StringUtils.isBlank(tenantId)) {
tenantId = LoginHelper.getTenantId(); tenantId = LoginHelper.getTenantId();