ly
/
Stwzhj-Cloud-Plus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix 修复 关闭租户功能 三方登录报错问题

2.X
疯狂的狮子Li 2024-01-02 13:01:30 +08:00
parent 53e50a4b78
commit 2ab5fc9ed7
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ruoyi-auth/src/main/java/org/dromara/auth/service/impl/SocialAuthStrategy.java
View File

@ -21,6 +21,7 @@ import org.dromara.common.json.utils.JsonUtils;
import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.common.social.config.properties.SocialProperties; import org.dromara.common.social.config.properties.SocialProperties;
import org.dromara.common.social.utils.SocialUtils; import org.dromara.common.social.utils.SocialUtils;
import org.dromara.common.tenant.helper.TenantHelper;
import org.dromara.system.api.RemoteSocialService; import org.dromara.system.api.RemoteSocialService;
import org.dromara.system.api.RemoteUserService; import org.dromara.system.api.RemoteUserService;
import org.dromara.system.api.domain.vo.RemoteClientVo; import org.dromara.system.api.domain.vo.RemoteClientVo;
@ -80,11 +81,16 @@ public class SocialAuthStrategy implements IAuthStrategy {
if (CollUtil.isEmpty(list)) { if (CollUtil.isEmpty(list)) {
throw new ServiceException("你还没有绑定第三方账号，绑定后才可以登录！"); throw new ServiceException("你还没有绑定第三方账号，绑定后才可以登录！");
} }
Optional<RemoteSocialVo> opt = list.stream().filter(x -> x.getTenantId().equals(loginBody.getTenantId())).findAny(); RemoteSocialVo socialVo;
if (opt.isEmpty()) { if (TenantHelper.isEnable()) {
throw new ServiceException("对不起，你没有权限登录当前租户！"); Optional<RemoteSocialVo> opt = list.stream().filter(x -> x.getTenantId().equals(loginBody.getTenantId())).findAny();
if (opt.isEmpty()) {
throw new ServiceException("对不起，你没有权限登录当前租户！");
}
socialVo = opt.get();
} else {
socialVo = list.get(0);
} }
RemoteSocialVo socialVo = opt.get();
LoginUser loginUser = remoteUserService.getUserInfo(socialVo.getUserId(), socialVo.getTenantId()); LoginUser loginUser = remoteUserService.getUserInfo(socialVo.getUserId(), socialVo.getTenantId());
loginUser.setClientKey(client.getClientKey()); loginUser.setClientKey(client.getClientKey());