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

10
ZR.Service/System/IService/ISysOperLogService.cs
View File

@@ -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>
/// 清空操作日志

8
ZR.Service/System/SysOperLogService.cs
View File

@@ -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>