From cbd59f84fd7d688569cade242e4e9d6d0f381f15 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 18 六月 2024 18:44:04 +0800
Subject: [PATCH] update 优化 三方登录不同域名获取不到租户id问题
---
ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java b/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java
index 982f9c7..d340229 100644
--- a/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java
@@ -142,7 +142,6 @@
SpringUtils.context().publishEvent(logininforEvent);
}
-
/**
* 鏋勫缓鐧诲綍鐢ㄦ埛
*/
@@ -162,6 +161,7 @@
dept = deptService.selectDeptById(user.getDeptId());
}
loginUser.setDeptName(ObjectUtil.isNull(dept) ? "" : dept.getDeptName());
+ loginUser.setDeptCategory(ObjectUtil.isNull(dept) ? "" : dept.getDeptCategory());
List<SysRoleVo> roles = roleService.selectRolesByUserId(user.getUserId());
loginUser.setRoles(BeanUtil.copyToList(roles, RoleDTO.class));
});
@@ -221,17 +221,17 @@
*
* @param tenantId 绉熸埛ID
*/
- public void checkTenant(String tenantId) {
+ public SysTenantVo checkTenant(String tenantId) {
if (!TenantHelper.isEnable()) {
- return;
- }
- if (TenantConstants.DEFAULT_TENANT_ID.equals(tenantId)) {
- return;
+ return null;
}
if (StringUtils.isBlank(tenantId)) {
throw new TenantException("tenant.number.not.blank");
}
SysTenantVo tenant = tenantService.queryByTenantId(tenantId);
+ if (TenantConstants.DEFAULT_TENANT_ID.equals(tenantId)) {
+ return tenant;
+ }
if (ObjectUtil.isNull(tenant)) {
log.info("鐧诲綍绉熸埛锛歿} 涓嶅瓨鍦�.", tenantId);
throw new TenantException("tenant.not.exists");
@@ -243,6 +243,7 @@
log.info("鐧诲綍绉熸埛锛歿} 宸茶秴杩囨湁鏁堟湡.", tenantId);
throw new TenantException("tenant.expired");
}
+ return tenant;
}
}
--
Gitblit v1.9.3