From 2a43fa0591507246ee903066da1d98875e832328 Mon Sep 17 00:00:00 2001 From: JaguarJack Date: Thu, 6 Apr 2023 21:33:36 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AF=B9=E9=9D=9E=E8=B6=85=E7=BA=A7?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E9=9A=90=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/User/Http/Controllers/UserController.php | 8 +++++++- modules/User/Models/User.php | 9 ++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/modules/User/Http/Controllers/UserController.php b/modules/User/Http/Controllers/UserController.php index bc19287..b4582b9 100644 --- a/modules/User/Http/Controllers/UserController.php +++ b/modules/User/Http/Controllers/UserController.php @@ -27,7 +27,13 @@ class UserController extends Controller */ public function index() { - return $this->user->getList(); + return $this->user->setBeforeGetList(function ($query){ + if (! $this->getLoginUser()->isSuperAdmin()) { + return $query->where('id', '<>', config('catch.super_admin')); + } + + return $query; + })->getList(); } /** diff --git a/modules/User/Models/User.php b/modules/User/Models/User.php index 1b626a6..509022b 100644 --- a/modules/User/Models/User.php +++ b/modules/User/Models/User.php @@ -70,6 +70,13 @@ class User extends Model implements AuthenticatableContract ); } + protected function DepartmentId(): Attribute + { + return new Attribute( + get: fn($value) => $value ? : null + ); + } + /** * is super admin * @@ -91,7 +98,7 @@ class User extends Model implements AuthenticatableContract if (isset($data['password']) && ! $data['password']) { unset($data['password']); } - + return parent::updateBy($id, $data); } }