Commit ea4ddedf authored by tanyang's avatar tanyang

更新多租户登录逻辑

parent b973b2aa
......@@ -112,8 +112,13 @@ public class SysLoginService {
log.info("登录用户:{} 不存在.", username);
throw new UserException("user.not.exists", username);
} else if (sysUsers.size() > 1) {
//处理存在多个用户的情况,取一个最新租户
SysUser sysUser = sysUsers.get(0);
//处理存在多个用户的情况,且不存在正常账号, 取一个最新租户
SysUser sysUser = null;
for (SysUser user : sysUsers) {
}
sysUsers.get(0);
if (ObjectUtil.isEmpty(sysUser)) {
log.info("登录用户:{} 不存在.", username);
throw new UserException("user.not.exists", username);
......@@ -556,17 +561,17 @@ public class SysLoginService {
List<SysUser> sysUsers = null;
if (ReUtil.isMatch(RegexPool.MOBILE, username)) {
LambdaQueryWrapper<SysUser> lqw = new LambdaQueryWrapper<SysUser>()
.select(SysUser::getUserName, SysUser::getStatus, SysUser::getTenantId)
.eq(SysUser::getPhonenumber, username)
.orderByDesc(SysUser::getUserId);
sysUsers = userMapper.selectList(lqw);
// LambdaQueryWrapper<SysUser> lqw = new LambdaQueryWrapper<SysUser>()
// .select(SysUser::getUserName, SysUser::getStatus, SysUser::getTenantId)
// .eq(SysUser::getPhonenumber, username)
// .orderByDesc(SysUser::getUserId);
sysUsers = userMapper.selectUserByTenantPhone(username);
} else {
LambdaQueryWrapper<SysUser> lqw = new LambdaQueryWrapper<SysUser>()
.select(SysUser::getUserName, SysUser::getStatus, SysUser::getTenantId)
.eq(SysUser::getUserName, username)
.orderByDesc(SysUser::getUserId);
sysUsers = userMapper.selectList(lqw);
// LambdaQueryWrapper<SysUser> lqw = new LambdaQueryWrapper<SysUser>()
// .select(SysUser::getUserName, SysUser::getStatus, SysUser::getTenantId)
// .eq(SysUser::getUserName, username)
// .orderByDesc(SysUser::getUserId);
sysUsers = userMapper.selectUserByTenantUsername(username);
}
return sysUsers;
});
......
......@@ -145,7 +145,7 @@
where t.del_flag=0
and t.status=0
and t1.phonenumber=#{phonenumber}
order by t1.create_time desc
order by t1.user_id desc
</select>
<select id="selectUserByTenantUsername" resultType="com.dsk.system.domain.SysUser">
......@@ -154,6 +154,6 @@
where t.del_flag=0
and t.status=0
and t1.user_name=#{username}
order by t1.create_time desc
order by t1.user_id desc
</select>
</mapper>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment