From 7317568ccf051044dfde20f01e15ade20ad13566 Mon Sep 17 00:00:00 2001 From: leo <10200039@qq.com> Date: Fri, 21 Apr 2023 13:04:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E5=99=A8BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/OperateLogController.cs | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/FactorySystemApi/Controllers/OperateLogController.cs b/FactorySystemApi/Controllers/OperateLogController.cs index 8fac8cc..dd748ed 100644 --- a/FactorySystemApi/Controllers/OperateLogController.cs +++ b/FactorySystemApi/Controllers/OperateLogController.cs @@ -23,8 +23,25 @@ namespace FactorySystemApi.Controllers public ApiResult GetPageList(Dictionary inParam) { var apiResult = new ApiResult(); - int pageNumber = int.Parse(inParam["current"].ToString()); - int pageSize = int.Parse(inParam["limit"].ToString()); + + return ExceptionHelper.TryReturnException(() => + { + apiResult.Data = new + { + List = _operateLogBll.GetPageList(inParam, out int totalCount) + }; + }, apiResult, Request); + } + + /// + /// 获取分页 + /// + [HttpPost] + public ApiResult GetPageListByParams(Dictionary inParam) + { + var apiResult = new ApiResult(); + int pageNumber = int.Parse(inParam.ContainsKey("current") && !string.IsNullOrEmpty(inParam["current"].ToString()) ? inParam["current"].ToString() : "0"); + int pageSize = int.Parse(inParam.ContainsKey("limit") && !string.IsNullOrEmpty(inParam["limit"].ToString()) ? inParam["limit"].ToString() : "10"); string FName = inParam.ContainsKey("FName") ? inParam["FName"].ToString() : ""; int FType = int.Parse(inParam.ContainsKey("FType") && !string.IsNullOrEmpty(inParam["FType"].ToString()) ? inParam["FType"].ToString() : "0"); int FModule = int.Parse(inParam.ContainsKey("FModule") && !string.IsNullOrEmpty(inParam["FModule"].ToString()) ? inParam["FModule"].ToString() : "0");