From 521f32dce0485847444ccbee98bfd2ef361571c0 Mon Sep 17 00:00:00 2001
From: JaguarJack <njphper@gmail.com>
Date: Mon, 17 Apr 2023 16:47:53 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/User/Http/Controllers/UserController.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/modules/User/Http/Controllers/UserController.php b/modules/User/Http/Controllers/UserController.php
index b4582b9..b07c59e 100644
--- a/modules/User/Http/Controllers/UserController.php
+++ b/modules/User/Http/Controllers/UserController.php
@@ -7,6 +7,7 @@ use Catch\Support\Module\ModuleRepository;
 use Illuminate\Contracts\Auth\Authenticatable;
 use Illuminate\Contracts\Pagination\LengthAwarePaginator;
 use Illuminate\Http\Request;
+use Modules\Permissions\Models\Departments;
 use Modules\User\Models\LogLogin;
 use Modules\User\Models\LogOperate;
 use Modules\User\Models\User;
@@ -29,7 +30,14 @@ class UserController extends Controller
     {
         return $this->user->setBeforeGetList(function ($query){
             if (! $this->getLoginUser()->isSuperAdmin()) {
-                return $query->where('id', '<>', config('catch.super_admin'));
+                $query = $query->where('id', '<>', config('catch.super_admin'));
+            }
+
+            if (\request()->has('department_id')) {
+                $departmentId = \request()->get('department_id');
+                $followDepartmentIds = app(Departments::class)->findFollowDepartments(\request()->get('department_id'));
+                $followDepartmentIds[] = $departmentId;
+                $query = $query->whereIn('department_id', $followDepartmentIds);
             }
 
             return $query;