From def5e396e1c3d44c0f8b426f042be881013eac33 Mon Sep 17 00:00:00 2001
From: JaguarJack <njphper@gmail.com>
Date: Thu, 16 Apr 2020 17:14:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 catch/user/model/UserSearch.php | 5 +++++
 catch/user/model/Users.php      | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/catch/user/model/UserSearch.php b/catch/user/model/UserSearch.php
index 9c73938..32254ee 100644
--- a/catch/user/model/UserSearch.php
+++ b/catch/user/model/UserSearch.php
@@ -17,4 +17,9 @@ trait UserSearch
     {
         return $query->where($this->aliasField('status'), $value);
     }
+
+    public function searchDepartmentIdAttr($query, $value, $data)
+    {
+        return $query->where($this->aliasField('department_id'), $value);
+    }
 }
diff --git a/catch/user/model/Users.php b/catch/user/model/Users.php
index 8105c70..24660a8 100644
--- a/catch/user/model/Users.php
+++ b/catch/user/model/Users.php
@@ -4,6 +4,7 @@ namespace catchAdmin\user\model;
 use catchAdmin\permissions\model\Department;
 use catchAdmin\permissions\model\HasJobsTrait;
 use catchAdmin\permissions\model\HasRolesTrait;
+use catchAdmin\permissions\model\Permissions;
 use catcher\base\CatchModel;
 
 class Users extends CatchModel
@@ -71,6 +72,11 @@ class Users extends CatchModel
      */
     public function getPermissionsBy($uid = 0): array
     {
+        // 获取超级管理配置 超级管理员全部权限
+        if ($uid == config('catch.permissions.super_user_id')) {
+            return Permissions::select()->column('id');
+        }
+
         $roles = $uid ? $this->findBy($uid)->getRoles() : $this->getRoles();
 
         $permissionIds = [];