0b2/catchAdmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 优化用户管理

Browse Source
This commit is contained in:
JaguarJack
2023-04-17 16:47:53 +08:00
parent c7c8500041
commit 521f32dce0
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/User/Http/Controllers/UserController.php
View File

@@ -7,6 +7,7 @@ use Catch\Support\Module\ModuleRepository;
use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Contracts\Pagination\LengthAwarePaginator; use Illuminate\Contracts\Pagination\LengthAwarePaginator;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Modules\Permissions\Models\Departments;
use Modules\User\Models\LogLogin; use Modules\User\Models\LogLogin;
use Modules\User\Models\LogOperate; use Modules\User\Models\LogOperate;
use Modules\User\Models\User; use Modules\User\Models\User;
@@ -29,7 +30,14 @@ class UserController extends Controller
{ {
return $this->user->setBeforeGetList(function ($query){ return $this->user->setBeforeGetList(function ($query){
if (! $this->getLoginUser()->isSuperAdmin()) { 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; return $query;