diff --git a/IRaCIS.Core.Application/Service/Management/UserService.cs b/IRaCIS.Core.Application/Service/Management/UserService.cs index 5cd66f644..8acf32cc5 100644 --- a/IRaCIS.Core.Application/Service/Management/UserService.cs +++ b/IRaCIS.Core.Application/Service/Management/UserService.cs @@ -1036,7 +1036,7 @@ namespace IRaCIS.Core.Application.Service }); //返回临时token - userLoginReturnModel.JWTStr = _tokenService.GetToken(new UserTokenInfo() { UserName = userName }); + userLoginReturnModel.JWTStr = _tokenService.GetToken(new UserTokenInfo() { IdentityUserId = _userInfo.IdentityUserId, UserName = userName }); var userId = loginUser.Id; @@ -1089,13 +1089,14 @@ namespace IRaCIS.Core.Application.Service /// /// 验证密码成功后,选定角色,然后获取当前角色的Token /// - /// /// /// /// /// - public async Task LoginSelectUserRole(Guid identityUserId, Guid userTypeId, [FromServices] ITokenService _tokenService) + public async Task LoginSelectUserRole(Guid userTypeId, [FromServices] ITokenService _tokenService) { + var identityUserId = _userInfo.IdentityUserId; + var userTokenInfo = await _userRepository.Where(t => t.IdentityUserId == identityUserId && t.UserTypeId == userTypeId).Select(t => new UserTokenInfo() { UserRoleId = t.Id,