From 1ae0e7de403378935f259742a151a641cc3029b2 Mon Sep 17 00:00:00 2001 From: tongfei <244188119@qq.com> Date: Sat, 11 Nov 2023 17:40:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=86=E7=A0=81=E7=99=BB=E5=BD=95=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/WMS.Web.Domain/Services/Public/LoginService.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/WMS.Web.Domain/Services/Public/LoginService.cs b/src/WMS.Web.Domain/Services/Public/LoginService.cs index 9f692766..b5d3b179 100644 --- a/src/WMS.Web.Domain/Services/Public/LoginService.cs +++ b/src/WMS.Web.Domain/Services/Public/LoginService.cs @@ -11,6 +11,7 @@ using System.Threading.Tasks; using WMS.Web.Core.Dto.Login; using WMS.Web.Core.Dto.Login.Temp; using WMS.Web.Core.Dto.Login.Temp.v3; +using WMS.Web.Core.Dto.SingleData; using WMS.Web.Core.Help; using WMS.Web.Core.Internal.Results; using WMS.Web.Core.Internal.Security; @@ -266,7 +267,7 @@ namespace WMS.Web.Domain.Services.Public UserId = entity.id, }; - var loginResponse_result = await _singleDataService.GetSingleDataNoCache, LoginSingleRequest, SingleLoginAction> + var loginResponse_result = await _singleDataService.GetSingleDataNoCache, LoginSingleRequest, SingleLoginAction> (loginRequest, SingleLoginAction.Staff, type: SingleControllerType.Login); //绑定返回对象的登录信息 @@ -276,10 +277,10 @@ namespace WMS.Web.Domain.Services.Public if (loginResponse_result.Success && loginResponse_result.Data != null) { var loginResponse = loginResponse_result.Data; - if (loginResponse.Staff != null) + if (loginResponse != null) { - r.UserInfo.StaffId = loginResponse.Staff.Id; - staffName = loginResponse.Staff.Name; + r.UserInfo.StaffId = loginResponse.Id; + staffName = loginResponse.Name; } } r.UserInfo.CompanyId = userInfo_v3.Company.Id;