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");