From 0ef7ef675cc3f8fecee44c09620df9aaa2ec12c4 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Mon, 9 Feb 2026 21:17:47 -0500 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=80=E5=87=BA=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=85=81=E8=AE=B8=E8=A7=92?= =?UTF-8?q?=E8=89=B2=E4=B8=BAnull?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Management/UserService.cs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Management/UserService.cs b/IRaCIS.Core.Application/Service/Management/UserService.cs index 788cb9392..fa46dfa78 100644 --- a/IRaCIS.Core.Application/Service/Management/UserService.cs +++ b/IRaCIS.Core.Application/Service/Management/UserService.cs @@ -296,7 +296,7 @@ namespace IRaCIS.Core.Application.Service var pwd = IRCEmailPasswordHelper.GenerateRandomPassword(10); - await _mailVerificationService.AdminResetPwdSendEmailAsync(identityUserId, pwd,inCommand.BaseUrl); + await _mailVerificationService.AdminResetPwdSendEmailAsync(identityUserId, pwd, inCommand.BaseUrl); await _identityUserRepository.UpdatePartialFromQueryAsync(t => t.Id == identityUserId, u => new IdentityUser() { @@ -936,11 +936,11 @@ namespace IRaCIS.Core.Application.Service [AllowAnonymous] [HttpGet] - public async Task LoginOut(Guid identityUserId, Guid userRoleId) + public async Task LoginOut(Guid identityUserId, Guid? userRoleId) { await _fusionCache.RemoveAsync(CacheKeys.UserToken(identityUserId)); - if (_identityUserRepository.Any(t => t.Id == identityUserId)) + if (_identityUserRepository.Any(t => t.Id == identityUserId) && userRoleId != null) { var userName = await _userRoleRepository.Where(t => t.Id == userRoleId).Select(t => t.IdentityUser.UserName).FirstOrDefaultAsync(); @@ -1223,6 +1223,10 @@ namespace IRaCIS.Core.Application.Service } } + else + { + userLoginReturnModel.BasicInfo.HiddenEmail = userLoginReturnModel.BasicInfo.EMail; + } await _fusionCache.SetAsync(CacheKeys.UserToken(identityUserId), userLoginReturnModel.JWTStr, TimeSpan.FromDays(7));