From 7f72784bfbfe93596964178b7141dc37fafec7f1 Mon Sep 17 00:00:00 2001
From: JaguarJack <njphper@gmail.com>
Date: Tue, 28 Apr 2020 22:04:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 catch/permissions/controller/User.php | 4 ++--
 catch/permissions/model/Users.php     | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/catch/permissions/controller/User.php b/catch/permissions/controller/User.php
index 9924a92..5300ffc 100644
--- a/catch/permissions/controller/User.php
+++ b/catch/permissions/controller/User.php
@@ -26,10 +26,10 @@ class User extends CatchController
 
     /**
      *
-     * @time 2019年12月04日
+     * @time 2020年04月24日
      * @param Request $request
-     * @return string
      * @throws \think\db\exception\DbException
+     * @return \think\response\Json
      */
     public function index(Request $request)
     {
diff --git a/catch/permissions/model/Users.php b/catch/permissions/model/Users.php
index fe05e42..b7e9d5b 100644
--- a/catch/permissions/model/Users.php
+++ b/catch/permissions/model/Users.php
@@ -44,17 +44,16 @@ class Users extends CatchModel
      * 用户列表
      *
      * @time 2019年12月08日
-     * @param $search
      * @throws \think\db\exception\DbException
      * @return \think\Paginator
      */
-    public function getList($search): \think\Paginator
+    public function getList(): \think\Paginator
     {
         return $this->withoutField(['updated_at'], true)
                     ->catchSearch()
                     ->catchLeftJoin(Department::class, 'id', 'department_id', ['department_name'])
                     ->order($this->getTable() . '.id', 'desc')
-                    ->paginate($search['limit'] ?? parent::LIMIT);
+                    ->paginate();
     }
 
     /**