|
|
@@ -51,7 +51,7 @@ public class DefaultAccountOperator implements IAccountOperator {
|
|
|
@Override
|
|
|
public UserInfoVO getUserInfo() {
|
|
|
UserInfoVO userInfoVO = new UserInfoVO();
|
|
|
- LoginUser<String> loginUser = SecurityUtil.getLoginUser();
|
|
|
+ LoginUser loginUser = SecurityUtil.getLoginUser();
|
|
|
if(GrantTypeEnum.WEB_USERNAME_PASSWORD.equals(loginUser.getGrantType())){
|
|
|
SysUser sysUser = sysUserService.getById(SecurityUtil.getStpLogic().getLoginIdAsLong());
|
|
|
// 查询角色列表
|
|
|
@@ -71,7 +71,7 @@ public class DefaultAccountOperator implements IAccountOperator {
|
|
|
userInfoVO.setIsSys(sysUser.getIsSys());
|
|
|
userInfoVO.setTenantName(sysUser.getTenantName());
|
|
|
}
|
|
|
- userInfoVO.setTenantId(loginUser.getTenantId());
|
|
|
+ userInfoVO.setTenantId(String.valueOf(loginUser.getTenantId()));
|
|
|
return userInfoVO;
|
|
|
}
|
|
|
|