From 20091aaf439d45b0a143932a65169080f0b07683 Mon Sep 17 00:00:00 2001 From: JaguarJack Date: Fri, 17 Apr 2020 15:02:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=8A=A8=E6=80=81=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- catch/system/controller/LoginLog.php | 2 +- catch/system/controller/OperateLog.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/catch/system/controller/LoginLog.php b/catch/system/controller/LoginLog.php index f5f3ef7..1c174a6 100644 --- a/catch/system/controller/LoginLog.php +++ b/catch/system/controller/LoginLog.php @@ -9,7 +9,7 @@ class LoginLog extends CatchController { public function list() { - return CatchResponse::paginate(Db::name('login_log')->paginate(10)); + return CatchResponse::paginate(Db::name('login_log')->paginate(request()->param('limit') ?? 10)); } public function empty() diff --git a/catch/system/controller/OperateLog.php b/catch/system/controller/OperateLog.php index 1d35e82..55e30f7 100644 --- a/catch/system/controller/OperateLog.php +++ b/catch/system/controller/OperateLog.php @@ -14,7 +14,7 @@ class OperateLog extends CatchController ->field(['operate_log.*', 'users.username as creator']) ->join('users','users.id = operate_log.creator_id') ->order('id', 'desc') - ->paginate(10) + ->paginate(request()->param('limit') ?? 10) ); }