From f2a58057d191e53803dc2979713315765117b9b7 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: Thu, 7 Dec 2023 22:02:50 +0800
Subject: [PATCH] =?UTF-8?q?:zap:=E4=BC=98=E5=8C=96=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/System/monitor/SysOperlogController.cs      | 5 +----
 ZR.ServiceCore/Services/SysOperLogService.cs                | 6 ++++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/ZR.Admin.WebApi/Controllers/System/monitor/SysOperlogController.cs b/ZR.Admin.WebApi/Controllers/System/monitor/SysOperlogController.cs
index 7200207..756d307 100644
--- a/ZR.Admin.WebApi/Controllers/System/monitor/SysOperlogController.cs
+++ b/ZR.Admin.WebApi/Controllers/System/monitor/SysOperlogController.cs
@@ -1,5 +1,4 @@
 using Microsoft.AspNetCore.Mvc;
-using ZR.Admin.WebApi.Extensions;
 using ZR.Admin.WebApi.Filters;
 using ZR.Model.System.Dto;
 
@@ -15,12 +14,10 @@ namespace ZR.Admin.WebApi.Controllers.monitor
     public class SysOperlogController : BaseController
     {
         private ISysOperLogService sysOperLogService;
-        private IWebHostEnvironment WebHostEnvironment;
 
-        public SysOperlogController(ISysOperLogService sysOperLogService, IWebHostEnvironment hostEnvironment)
+        public SysOperlogController(ISysOperLogService sysOperLogService)
         {
             this.sysOperLogService = sysOperLogService;
-            WebHostEnvironment = hostEnvironment;
         }
 
         /// <summary>
diff --git a/ZR.ServiceCore/Services/SysOperLogService.cs b/ZR.ServiceCore/Services/SysOperLogService.cs
index 7fb5cc9..48c1b55 100644
--- a/ZR.ServiceCore/Services/SysOperLogService.cs
+++ b/ZR.ServiceCore/Services/SysOperLogService.cs
@@ -34,14 +34,16 @@ namespace ZR.ServiceCore.Services
         public PagedInfo<SysOperLog> SelectOperLogList(SysOperLogQueryDto sysOper)
         {
             var exp = Expressionable.Create<SysOperLog>();
-            exp.And(it => it.OperTime >= sysOper.BeginTime && it.OperTime <= sysOper.EndTime);
+            exp.AndIF(sysOper.BeginTime == null, it => it.OperTime >= DateTime.Now.ToShortDateString().ParseToDateTime());
+            exp.AndIF(sysOper.BeginTime != null, it => it.OperTime >= sysOper.BeginTime && it.OperTime <= sysOper.EndTime);
             exp.AndIF(sysOper.Title.IfNotEmpty(), it => it.Title.Contains(sysOper.Title));
             exp.AndIF(sysOper.OperName.IfNotEmpty(), it => it.OperName.Contains(sysOper.OperName));
             exp.AndIF(sysOper.BusinessType != -1, it => it.BusinessType == sysOper.BusinessType);
             exp.AndIF(sysOper.Status != -1, it => it.Status == sysOper.Status);
             exp.AndIF(sysOper.OperParam != null, it => it.OperParam.Contains(sysOper.OperParam));
 
-            return Queryable().Where(exp.ToExpression())
+            return Queryable()
+                .Where(exp.ToExpression())
                 .OrderBy(x => x.OperId, OrderByType.Desc)
                 .ToPage(sysOper);
         }