From da14901f3edefaf4c016f4025bc8930913a50c86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Sun, 2 Jan 2022 10:46:21 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=97=A5=E5=BF=97=E7=A7=BB?=
 =?UTF-8?q?=E9=99=A4Sysbase=E7=BB=A7=E6=89=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/System/monitor/SysLogininforController.cs   | 1 -
 ZR.Model/System/SysLogininfor.cs                            | 6 +++++-
 ZR.Repository/System/SysLogininfoRepository.cs              | 4 +---
 3 files changed, 6 insertions(+), 5 deletions(-)

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
     /// </summary>
     [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
         /// </summary>
         [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<SysLogininfor>()
                 .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();
         }