From 13d3734dba266e5977dbb1e3af759730454505da Mon Sep 17 00:00:00 2001 From: JaguarJack Date: Wed, 17 Jun 2020 13:24:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- catch/permissions/model/Department.php | 2 +- catch/permissions/model/Permissions.php | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/catch/permissions/model/Department.php b/catch/permissions/model/Department.php index 8519c67..0dd0ddd 100644 --- a/catch/permissions/model/Department.php +++ b/catch/permissions/model/Department.php @@ -38,7 +38,7 @@ class Department extends CatchModel return $this->withoutField(['department_name']) ->addFields(['department_name as title']) ->catchSearch() - ->order() + ->catchOrder() ->select()->toArray(); } } diff --git a/catch/permissions/model/Permissions.php b/catch/permissions/model/Permissions.php index 4ac5b85..00b4d4b 100644 --- a/catch/permissions/model/Permissions.php +++ b/catch/permissions/model/Permissions.php @@ -44,8 +44,7 @@ class Permissions extends CatchModel public function getList($isMenu = false) { return $this->catchSearch() - ->order('sort', 'desc') - ->order('id', 'desc') + ->catchOrder() ->when($isMenu, function ($query){ $query->where('type', self::MENU_TYPE); }) @@ -74,7 +73,7 @@ class Permissions extends CatchModel 'route', 'icon', 'component', 'redirect', 'keepalive as keepAlive', 'hide_children_in_menu', 'type', 'permission_mark', 'status' ]) - ->order() + ->catchOrder() ->select(); }