From d75c455bdce802813706fefe1ff862a335455a40 Mon Sep 17 00:00:00 2001
From: JaguarJack <njphper@gmail.com>
Date: Tue, 8 Sep 2020 14:36:32 +0800
Subject: [PATCH] =?UTF-8?q?update:=E6=9B=B4=E6=96=B0=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 catch/permissions/model/search/UserSearch.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/catch/permissions/model/search/UserSearch.php b/catch/permissions/model/search/UserSearch.php
index fc1cc05..2dcf4cd 100644
--- a/catch/permissions/model/search/UserSearch.php
+++ b/catch/permissions/model/search/UserSearch.php
@@ -1,6 +1,8 @@
 <?php
 namespace catchAdmin\permissions\model\search;
 
+use catchAdmin\permissions\model\Department;
+
 trait UserSearch
 {
     public function searchUsernameAttr($query, $value, $data)
@@ -20,6 +22,8 @@ trait UserSearch
 
     public function searchDepartmentIdAttr($query, $value, $data)
     {
-        return $query->where($this->aliasField('department_id'), $value);
+        $departmentIds = Department::where('parent_id', $value)->column('id');
+        $departmentIds[] = $value;
+        return $query->whereIn($this->aliasField('department_id'), $departmentIds);
     }
 }