mirror of
http://git.pig4cloud.com/pig/pigx.git
synced 2026-11-08 12:39:05 +08:00
feat(tenant): 完善用户注册时tenantId的自动填充逻辑
- 在RegisterUserDTO中新增tenantId字段用于接收前端传入的租户ID - 修改SysUserServiceImpl中用户注册逻辑,支持自动继承当前登录用户的tenantId - 调整SysUserMapper.xml查询条件,允许查询未分配tenantId的用户
This commit is contained in:
1 parent
886471f96a
commit
b1646437bc
3 files changed
+11
-5
No files matched your search
+5
@@ -30,4 +30,9 @@ public class RegisterUserDTO {
|
||||
* 电话
|
||||
*/
|
||||
private String phone;
|
||||
|
||||
/**
|
||||
* 租户ID
|
||||
*/
|
||||
private Long tenantId;
|
||||
}
|
||||
+2
-1
@@ -156,7 +156,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
||||
// 插入用户租户关系表
|
||||
SysTenantUser sysTenantUser = new SysTenantUser();
|
||||
sysTenantUser.setUserId(sysUser.getUserId());
|
||||
sysTenantUser.setTenantId(SecurityUtils.getUser().getTenantId());
|
||||
sysTenantUser.setTenantId(Objects.nonNull(SecurityUtils.getUser())
|
||||
? SecurityUtils.getUser().getTenantId() : userDto.getTenantId());
|
||||
sysTenantUserMapper.insert(sysTenantUser);
|
||||
return Boolean.TRUE;
|
||||
}
|
||||
|
||||
@@ -111,9 +111,9 @@
|
||||
<include refid="userColumns"/>
|
||||
FROM
|
||||
sys_user u
|
||||
INNER JOIN sys_user_dept ud ON u.user_id = ud.user_id
|
||||
LEFT JOIN sys_user_dept ud ON u.user_id = ud.user_id
|
||||
WHERE
|
||||
ud.tenant_id = #{query.tenantId}
|
||||
ud.tenant_id = #{query.tenantId} OR ud.tenant_id IS NULL
|
||||
AND u.del_flag = '0'
|
||||
<!-- 用户名模糊查询 -->
|
||||
<if test="query.username != null and query.username != ''">
|
||||
@@ -138,9 +138,9 @@
|
||||
<include refid="userColumns"/>
|
||||
FROM
|
||||
sys_user u
|
||||
INNER JOIN sys_user_dept ud ON u.user_id = ud.user_id
|
||||
LEFT JOIN sys_user_dept ud ON u.user_id = ud.user_id
|
||||
WHERE
|
||||
ud.tenant_id = #{query.tenantId}
|
||||
ud.tenant_id = #{query.tenantId} OR ud.tenant_id IS NULL
|
||||
AND u.del_flag = '0'
|
||||
<!-- 用户名模糊查询 -->
|
||||
<if test="query.username != null and query.username != ''">
|
||||
|
||||
Reference in new issue
Block a user