Teams/shgx_tz_mes_backend_sync
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix：操作日志查询异常

Browse Source
This commit is contained in:
不做码农
2023-05-21 11:08:55 +08:00
parent a2364cdd78
commit 89293adcf0
4 changed files with 43 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ZR.Admin.WebApi/Controllers/System/monitor/SysOperlogController.cs
View File

@@ -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);
}