From 89293adcf095aab7486afcba69dbbba7be40801e 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, 21 May 2023 11:08:55 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E6=93=8D=E4=BD=9C=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E6=9F=A5=E8=AF=A2=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../System/monitor/SysOperlogController.cs    | 13 ++++----
 ZR.Model/System/Dto/SysOperLogDto.cs          | 30 ++++++++++++++++++-
 .../System/IService/ISysOperLogService.cs     | 10 ++-----
 ZR.Service/System/SysOperLogService.cs        |  8 +++--
 4 files changed, 43 insertions(+), 18 deletions(-)

diff --git a/ZR.Admin.WebApi/Controllers/System/monitor/SysOperlogController.cs b/ZR.Admin.WebApi/Controllers/System/monitor/SysOperlogController.cs
index a6fd1a1..867d32b 100644
--- a/ZR.Admin.WebApi/Controllers/System/monitor/SysOperlogController.cs
+++ b/ZR.Admin.WebApi/Controllers/System/monitor/SysOperlogController.cs
@@ -1,12 +1,10 @@
 using Infrastructure.Attribute;
 using Infrastructure.Enums;
 using Infrastructure.Model;
-using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc;
 using ZR.Admin.WebApi.Extensions;
 using ZR.Admin.WebApi.Filters;
 using ZR.Common;
-using ZR.Model;
 using ZR.Model.System.Dto;
 using ZR.Service.System.IService;
 
@@ -34,12 +32,10 @@ namespace ZR.Admin.WebApi.Controllers.monitor
         /// <param name="sysOperLog"></param>
         /// <returns></returns>
         [HttpGet("list")]
-        public IActionResult OperList([FromQuery] SysOperLogDto sysOperLog)
+        public IActionResult OperList([FromQuery] SysOperLogQueryDto sysOperLog)
         {
-            PagerInfo pagerInfo = new(sysOperLog.PageNum, sysOperLog.PageSize);
-
             sysOperLog.OperName = !HttpContextExtension.IsAdmin(HttpContext) ? HttpContextExtension.GetName(HttpContext) : sysOperLog.OperName;
-            var list = sysOperLogService.SelectOperLogList(sysOperLog, pagerInfo);
+            var list = sysOperLogService.SelectOperLogList(sysOperLog);
 
             return SUCCESS(list);
         }
@@ -87,9 +83,10 @@ namespace ZR.Admin.WebApi.Controllers.monitor
         [Log(Title = "操作日志", BusinessType = BusinessType.EXPORT)]
         [ActionPermissionFilter(Permission = "monitor:operlog:export")]
         [HttpGet("export")]
-        public IActionResult Export([FromQuery] SysOperLogDto sysOperLog)
+        public IActionResult Export([FromQuery] SysOperLogQueryDto sysOperLog)
         {
-            var list = sysOperLogService.SelectOperLogList(sysOperLog, new PagerInfo(1, 10000));
+            sysOperLog.PageSize = 100000;
+            var list = sysOperLogService.SelectOperLogList(sysOperLog);
             var result = ExportExcelMini(list.Result, "操作日志", "操作日志");
             return ExportExcel(result.Item2, result.Item1);
         }
diff --git a/ZR.Model/System/Dto/SysOperLogDto.cs b/ZR.Model/System/Dto/SysOperLogDto.cs
index 0131ac1..36c6937 100644
--- a/ZR.Model/System/Dto/SysOperLogDto.cs
+++ b/ZR.Model/System/Dto/SysOperLogDto.cs
@@ -1,5 +1,33 @@
-namespace ZR.Model.System.Dto
+using System;
+
+namespace ZR.Model.System.Dto
 {
+    public class SysOperLogQueryDto : PagerInfo
+    {
+        /// <summary>
+        /// 操作人员
+        /// </summary>
+        public string OperName { get; set; }
+        /// <summary>
+        /// 业务类型 0=其它,1=新增,2=修改,3=删除,4=授权,5=导出,6=导入,7=强退,8=生成代码,9=清空数据
+        /// </summary>
+        public int BusinessType { get; set; } = -1;
+        /// <summary>
+        /// 状态
+        /// </summary>
+        public int Status { get; set; } = -1;
+        /// <summary>
+        /// 操作模块
+        /// </summary>
+        public string Title { get; set; }
+        /// <summary>
+        /// 请求参数
+        /// </summary>
+        public string OperParam { get; set; }
+        public DateTime? BeginTime { get; set; }
+        public DateTime? EndTime { get; set; }
+    }
+
     public class SysOperLogDto : SysBase
     {
         /// <summary>
diff --git a/ZR.Service/System/IService/ISysOperLogService.cs b/ZR.Service/System/IService/ISysOperLogService.cs
index fe6948b..f96402e 100644
--- a/ZR.Service/System/IService/ISysOperLogService.cs
+++ b/ZR.Service/System/IService/ISysOperLogService.cs
@@ -1,9 +1,6 @@
-using System.Collections.Generic;
-using ZR.Model;
-using ZR.Model.System.Dto;
+using ZR.Model;
 using ZR.Model.System;
-using ZR.Service.System;
-using Infrastructure.Model;
+using ZR.Model.System.Dto;
 
 namespace ZR.Service.System.IService
 {
@@ -15,9 +12,8 @@ namespace ZR.Service.System.IService
         /// 查询系统操作日志集合
         /// </summary>
         /// <param name="operLog">操作日志对象</param>
-        /// <param name="pager"></param>
         /// <returns>操作日志集合</returns>
-        public PagedInfo<SysOperLog> SelectOperLogList(SysOperLogDto operLog, PagerInfo pager);
+        public PagedInfo<SysOperLog> SelectOperLogList(SysOperLogQueryDto operLog);
 
         /// <summary>
         /// 清空操作日志
diff --git a/ZR.Service/System/SysOperLogService.cs b/ZR.Service/System/SysOperLogService.cs
index 076653d..0671a78 100644
--- a/ZR.Service/System/SysOperLogService.cs
+++ b/ZR.Service/System/SysOperLogService.cs
@@ -5,6 +5,7 @@ using SqlSugar;
 using ZR.Model;
 using ZR.Model.System;
 using ZR.Model.System.Dto;
+using ZR.Repository;
 using ZR.Service.System.IService;
 
 namespace ZR.Service.System
@@ -35,7 +36,7 @@ namespace ZR.Service.System
         /// <param name="sysOper">操作日志对象</param>
         /// <param name="pager"></param>
         /// <returns>操作日志集合</returns>
-        public PagedInfo<SysOperLog> SelectOperLogList(SysOperLogDto sysOper, PagerInfo pager)
+        public PagedInfo<SysOperLog> SelectOperLogList(SysOperLogQueryDto sysOper)
         {
             sysOper.BeginTime = DateTimeHelper.GetBeginTime(sysOper.BeginTime, -1);
             sysOper.EndTime = DateTimeHelper.GetBeginTime(sysOper.EndTime, 1);
@@ -48,7 +49,10 @@ namespace ZR.Service.System
             exp.AndIF(sysOper.Status != -1, it => it.Status == sysOper.Status);
             exp.AndIF(sysOper.OperParam != null, it => it.OperParam.Contains(sysOper.OperParam));
 
-            return GetPages(exp.ToExpression(), pager, x => x.OperId, OrderByType.Desc);
+            return Queryable().Where(exp.ToExpression())
+                .OrderBy(x => x.OperId, OrderByType.Desc)
+                .ToPage(sysOper);
+            //return GetList(exp.ToExpression(), pager, x => x.OperId, OrderByType.Desc);
         }
 
         /// <summary>