Browse Source

优化userInfo接口

test
smallchill 4 years ago
parent
commit
04472d3bb6
  1. 2
      blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java

2
blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java

@ -168,7 +168,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
UserOauth uo = userOauthService.getOne(Wrappers.<UserOauth>query().lambda().eq(UserOauth::getSource, userOauth.getSource()).eq(UserOauth::getUsername, userOauth.getUsername())); UserOauth uo = userOauthService.getOne(Wrappers.<UserOauth>query().lambda().eq(UserOauth::getSource, userOauth.getSource()).eq(UserOauth::getUsername, userOauth.getUsername()));
UserInfo userInfo; UserInfo userInfo;
if (Func.isNotEmpty(uo) && Func.isNotEmpty(uo.getUserId())) { if (Func.isNotEmpty(uo) && Func.isNotEmpty(uo.getUserId())) {
User user = this.getById(uo.getUserId()); User user = UserCache.getUser(uo.getUserId());
userInfo = this.userInfo(user.getTenantId(), user.getAccount()); userInfo = this.userInfo(user.getTenantId(), user.getAccount());
userInfo.setOauthId(Func.toStr(uo.getId())); userInfo.setOauthId(Func.toStr(uo.getId()));
} else { } else {

Loading…
Cancel
Save