diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 6a4cf1815..7cd213420 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -8122,9 +8122,6 @@ UserLogQuery 列表查询参数模型 - - UserLogAddOrEdit 列表查询参数模型 - 靶病灶是否为IUPD或者ICPD diff --git a/IRaCIS.Core.Application/Service/Management/DTO/UserLogViewModel.cs b/IRaCIS.Core.Application/Service/Management/DTO/UserLogViewModel.cs index aca8d17ed..ac60efbdc 100644 --- a/IRaCIS.Core.Application/Service/Management/DTO/UserLogViewModel.cs +++ b/IRaCIS.Core.Application/Service/Management/DTO/UserLogViewModel.cs @@ -9,7 +9,7 @@ using System.Collections.Generic; namespace IRaCIS.Core.Application.ViewModel { /// UserLogView 列表视图模型 - public class UserLogView: UserLogAddOrEdit + public class UserLogView { public Guid? Id { get; set; } public string IP { get; set; } @@ -20,13 +20,13 @@ namespace IRaCIS.Core.Application.ViewModel public string LoginUserName { get; set; } - public UserType LoginUserTypeEnum { get; set; } + public UserTypeEnum LoginUserTypeEnum { get; set; } public string OptUserName { get; set; } - public UserType OptUserTypeEnum { get; set; } + public UserTypeEnum OptUserTypeEnum { get; set; } } ///UserLogQuery 列表查询参数模型 @@ -47,11 +47,6 @@ namespace IRaCIS.Core.Application.ViewModel } - /// UserLogAddOrEdit 列表查询参数模型 - public class UserLogAddOrEdit - { - - } } diff --git a/IRaCIS.Core.Application/Service/Management/UserService.cs b/IRaCIS.Core.Application/Service/Management/UserService.cs index 8d0eb668c..c6540c7f4 100644 --- a/IRaCIS.Core.Application/Service/Management/UserService.cs +++ b/IRaCIS.Core.Application/Service/Management/UserService.cs @@ -705,9 +705,10 @@ namespace IRaCIS.Application.Services return pageList; } - public async Task LoginOut(Guid userId,string loginName) + [HttpGet] + public async Task LoginOut() { - await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, LoginUserId = userId, OptUserId=userId, OptType = UserOptType.LoginOut },true); + await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, LoginUserId = _userInfo.Id, OptUserId = _userInfo.Id, OptType = UserOptType.LoginOut },true); return ResponseOutput.Ok(); } diff --git a/IRaCIS.Core.Application/Service/Management/_MapConfig.cs b/IRaCIS.Core.Application/Service/Management/_MapConfig.cs index d2bd738a6..744c906a8 100644 --- a/IRaCIS.Core.Application/Service/Management/_MapConfig.cs +++ b/IRaCIS.Core.Application/Service/Management/_MapConfig.cs @@ -125,7 +125,6 @@ namespace IRaCIS.Core.Application.Service .ForMember(d => d.OptUserName, c => c.MapFrom(t => t.OptUser.UserName)) .ForMember(d => d.OptUserTypeEnum, c => c.MapFrom(t => t.OptUser.UserTypeEnum)) ; - CreateMap().ReverseMap(); } }