diff --git a/Myshipping.Core/Service/Log/Dto/OpLogInput.cs b/Myshipping.Core/Service/Log/Dto/OpLogInput.cs index d485a1c8..13002352 100644 --- a/Myshipping.Core/Service/Log/Dto/OpLogInput.cs +++ b/Myshipping.Core/Service/Log/Dto/OpLogInput.cs @@ -8,7 +8,7 @@ namespace Myshipping.Core.Service; public class OpLogInput : PageInputBase { /// - /// 名称 + /// 操作人名称 /// public string Name { get; set; } @@ -83,7 +83,7 @@ public class OpLogInput : PageInputBase public DateTime OpTime { get; set; } /// - /// 操作人 + /// 操作人账号 /// public string Account { get; set; } } diff --git a/Myshipping.Core/Service/Log/SysOpLogService.cs b/Myshipping.Core/Service/Log/SysOpLogService.cs index c329640b..4a6047ae 100644 --- a/Myshipping.Core/Service/Log/SysOpLogService.cs +++ b/Myshipping.Core/Service/Log/SysOpLogService.cs @@ -34,6 +34,9 @@ public class SysOpLogService : ISysOpLogService, IDynamicApiController, ITransie { var opLogs = await _sysOpLogRep.AsQueryable() .WhereIF(!string.IsNullOrWhiteSpace(input.Name), u => u.Name.Contains(input.Name.Trim())) + .WhereIF(!string.IsNullOrWhiteSpace(input.Account), u => u.Name.Contains(input.Account.Trim())) + .WhereIF(!string.IsNullOrWhiteSpace(input.Ip), u => u.Name.Contains(input.Ip.Trim())) + .WhereIF(!string.IsNullOrWhiteSpace(input.Url), u => u.Name.Contains(input.Url.Trim())) .WhereIF(Enum.IsDefined(typeof(YesOrNot),input.Success), u => u.Success == input.Success) .WhereIF(!string.IsNullOrWhiteSpace(input.SearchBeginTime), u => u.OpTime >= DateTime.Parse(input.SearchBeginTime.Trim()) && u.OpTime <= DateTime.Parse(input.SearchEndTime.Trim())) .OrderBy(u => u.Id, OrderByType.Desc)