diff --git a/ZR.Admin.WebApi/Controllers/System/monitor/SysOperlogController.cs b/ZR.Admin.WebApi/Controllers/System/monitor/SysOperlogController.cs
index 7712044..a013624 100644
--- a/ZR.Admin.WebApi/Controllers/System/monitor/SysOperlogController.cs
+++ b/ZR.Admin.WebApi/Controllers/System/monitor/SysOperlogController.cs
@@ -36,9 +36,9 @@ namespace ZR.Admin.WebApi.Controllers.monitor
[HttpGet("list")]
public IActionResult OperList([FromQuery] SysOperLogDto sysOperLog)
{
- PagerInfo pagerInfo = new(sysOperLog.pageNum, sysOperLog.PageSize);
+ PagerInfo pagerInfo = new(sysOperLog.PageNum, sysOperLog.PageSize);
- sysOperLog.operName = !HttpContextExtension.IsAdmin(HttpContext) ? HttpContextExtension.GetName(HttpContext) : sysOperLog.operName;
+ sysOperLog.OperName = !HttpContextExtension.IsAdmin(HttpContext) ? HttpContextExtension.GetName(HttpContext) : sysOperLog.OperName;
var list = sysOperLogService.SelectOperLogList(sysOperLog, pagerInfo);
return SUCCESS(list, "MM/dd HH:mm");
@@ -90,8 +90,8 @@ namespace ZR.Admin.WebApi.Controllers.monitor
public IActionResult Export([FromQuery] SysOperLogDto sysOperLog)
{
var list = sysOperLogService.SelectOperLogList(sysOperLog, new PagerInfo(1, 10000));
- string sFileName = ExportExcel(list.Result, "operlog", "操作日志");
- return SUCCESS(new { path = "/export/" + sFileName, fileName = sFileName });
+ 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 586a420..0131ac1 100644
--- a/ZR.Model/System/Dto/SysOperLogDto.cs
+++ b/ZR.Model/System/Dto/SysOperLogDto.cs
@@ -1,21 +1,16 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using ZR.Model.System;
-
-namespace ZR.Model.System.Dto
+namespace ZR.Model.System.Dto
{
public class SysOperLogDto : SysBase
{
///
/// 页码
///
- public int pageNum { get; set; }
+ public int PageNum { get; set; }
public int PageSize { get; set; }
///
/// 操作人员
///
- public string operName { get; set; }
+ public string OperName { get; set; }
///
/// 业务类型 0=其它,1=新增,2=修改,3=删除,4=授权,5=导出,6=导入,7=强退,8=生成代码,9=清空数据
///
@@ -28,5 +23,9 @@ namespace ZR.Model.System.Dto
/// 操作模块
///
public string Title { get; set; }
+ ///
+ /// 请求参数
+ ///
+ public string OperParam { get; set; }
}
}
diff --git a/ZR.Model/System/SysOperLog.cs b/ZR.Model/System/SysOperLog.cs
index 233ba26..65d75e1 100644
--- a/ZR.Model/System/SysOperLog.cs
+++ b/ZR.Model/System/SysOperLog.cs
@@ -43,8 +43,8 @@ namespace ZR.Model.System
public string OperName { get; set; }
/** 部门名称 */
- [DisplayName("部门名称")]
- public string DeptName { get; set; }
+ //[DisplayName("部门名称")]
+ //public string DeptName { get; set; }
/** 请求url */
[DisplayName("请求地址")]
diff --git a/ZR.Service/System/SysOperLogService.cs b/ZR.Service/System/SysOperLogService.cs
index dc4d9ec..076653d 100644
--- a/ZR.Service/System/SysOperLogService.cs
+++ b/ZR.Service/System/SysOperLogService.cs
@@ -43,9 +43,10 @@ namespace ZR.Service.System
var exp = Expressionable.Create();
exp.And(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.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 GetPages(exp.ToExpression(), pager, x => x.OperId, OrderByType.Desc);
}