admin/lx-admin-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!307 修复动态租户切换影响同租户下其他用户问题，增加用户新增角色必填后端验证

Browse Source 
Merge pull request !307 from Yjoioooo/5.X
This commit is contained in:
疯狂的狮子Li 2023-03-24 04:18:42 +00:00 committed by Gitee
commit 169e2e9ae9
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-common/ruoyi-common-tenant/src/main/java/com/ruoyi/common/tenant/helper/TenantHelper.java
View File

@ -73,7 +73,7 @@ public class TenantHelper {
if (!SpringMVCUtil.isWeb()) { if (!SpringMVCUtil.isWeb()) {
return TEMP_DYNAMIC_TENANT.get(); return TEMP_DYNAMIC_TENANT.get();
} }
String cacheKey = DYNAMIC_TENANT_KEY + ":" + LoginHelper.getTenantId(); String cacheKey = DYNAMIC_TENANT_KEY + ":" + LoginHelper.getUserId();
String tenantId = (String) SaHolder.getStorage().get(cacheKey); String tenantId = (String) SaHolder.getStorage().get(cacheKey);
if (StringUtils.isNotBlank(tenantId)) { if (StringUtils.isNotBlank(tenantId)) {
return tenantId; return tenantId;

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysUserBo.java
View File

@ -9,6 +9,7 @@ import com.ruoyi.system.domain.SysUser;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.Email; import jakarta.validation.constraints.Email;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size; import jakarta.validation.constraints.Size;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@ -110,6 +111,7 @@ public class SysUserBo extends BaseEntity {
/** /**
* 角色组 * 角色组
*/ */
@Size(min = 1, message = "用户角色不能为空")
private Long[] roleIds; private Long[] roleIds;
/** /**