diff --git a/IRaCIS.Core.Application/Service/Management/UserService.cs b/IRaCIS.Core.Application/Service/Management/UserService.cs index 8972ea053..f1584d4c3 100644 --- a/IRaCIS.Core.Application/Service/Management/UserService.cs +++ b/IRaCIS.Core.Application/Service/Management/UserService.cs @@ -1094,21 +1094,21 @@ namespace IRaCIS.Core.Application.Service /// /// 验证密码成功后,选定角色,然后获取当前角色的Token /// - /// + /// /// /// /// [HttpGet] - public async Task LoginSelectUserRole(Guid userTypeId, [FromServices] ITokenService _tokenService) + public async Task LoginSelectUserRole(Guid userRoleId, [FromServices] ITokenService _tokenService) { var identityUserId = _userInfo.IdentityUserId; - var userTokenInfo = await _userRepository.Where(t => t.IdentityUserId == identityUserId && t.UserTypeId == userTypeId).Select(t => new UserTokenInfo() + var userTokenInfo = await _userRepository.Where(t => t.IdentityUserId == identityUserId && t.Id == userRoleId).Select(t => new UserTokenInfo() { UserRoleId = t.Id, IdentityUserId = t.IdentityUserId, UserTypeEnum = t.UserTypeEnum, - UserTypeId = userTypeId, + UserTypeId = t.UserTypeId, IsTestUser = t.IsTestUser, IsZhiZhun = t.IsZhiZhun, FullName = t.FullName, @@ -1122,7 +1122,7 @@ namespace IRaCIS.Core.Application.Service { var jwt = _tokenService.GetToken(userTokenInfo); - var selectUserInfo = _userRepository.Where(t => t.IdentityUserId == identityUserId && t.UserTypeId == userTypeId).FirstOrDefault(); + var selectUserInfo = _userRepository.Where(t => t.IdentityUserId == identityUserId && t.Id == userRoleId).FirstOrDefault(); //多账号没维护 if (await _userRepository.Where(t => t.IdentityUserId == identityUserId).AnyAsync(t => t.IsMutiAccountInfoConfirm == false))