diff --git a/ZR.Admin.WebApi/Controllers/System/monitor/SysLogininforController.cs b/ZR.Admin.WebApi/Controllers/System/monitor/SysLogininforController.cs index 7bf08b7..0df0ade 100644 --- a/ZR.Admin.WebApi/Controllers/System/monitor/SysLogininforController.cs +++ b/ZR.Admin.WebApi/Controllers/System/monitor/SysLogininforController.cs @@ -85,7 +85,6 @@ namespace ZR.Admin.WebApi.Controllers.monitor .And(it => it.loginTime >= logininfoDto.BeginTime && it.loginTime <= logininfoDto.EndTime); var list = sysLoginService.Queryable().Where(exp.ToExpression()) - .IgnoreColumns(it => new { it.Create_by, it.Create_time, it.Update_by, it.Update_time, it.Remark }) .ToList(); string sFileName = ExportExcel(list, "loginlog", "登录日志"); diff --git a/ZR.Model/System/SysLogininfor.cs b/ZR.Model/System/SysLogininfor.cs index 958e2f4..1350e02 100644 --- a/ZR.Model/System/SysLogininfor.cs +++ b/ZR.Model/System/SysLogininfor.cs @@ -10,7 +10,7 @@ namespace ZR.Model.System /// [SugarTable("sys_logininfor")] [Tenant("0")] - public class SysLogininfor: SysBase + public class SysLogininfor { //[Key] [SugarColumn(IsPrimaryKey = true, IsIdentity = true)] @@ -55,5 +55,9 @@ namespace ZR.Model.System /// [EpplusTableColumn(NumberFormat = "yyyy-MM-dd HH:mm:ss")] public DateTime loginTime { get; set; } = DateTime.Now; + [SugarColumn(IsIgnore = true)] + public DateTime? BeginTime { get; set; } + [SugarColumn(IsIgnore = true)] + public DateTime? EndTime { get; set; } } } diff --git a/ZR.Repository/System/SysLogininfoRepository.cs b/ZR.Repository/System/SysLogininfoRepository.cs index f0d4ccd..5537664 100644 --- a/ZR.Repository/System/SysLogininfoRepository.cs +++ b/ZR.Repository/System/SysLogininfoRepository.cs @@ -26,8 +26,7 @@ namespace ZR.Repository.System exp.AndIF(logininfoDto.status.IfNotEmpty(), f => f.status == logininfoDto.status); var query = Context.Queryable() .Where(exp.ToExpression()) - .OrderBy(it => it.infoId, OrderByType.Desc) - .IgnoreColumns(it => new { it.Create_by, it.Create_time, it.Update_by, it.Update_time, it.Remark }); + .OrderBy(it => it.infoId, OrderByType.Desc); return query.ToPage(pager); } @@ -40,7 +39,6 @@ namespace ZR.Repository.System public void AddLoginInfo(SysLogininfor sysLogininfor) { int result = Context.Insertable(sysLogininfor) - .IgnoreColumns(it => new { it.Create_by, it.Create_time, it.Remark }) .ExecuteReturnIdentity(); }