diff --git a/app/Admin/Controllers/System/AdminUserController.php b/app/Admin/Controllers/System/AdminUserController.php index fc68080..e27142f 100644 --- a/app/Admin/Controllers/System/AdminUserController.php +++ b/app/Admin/Controllers/System/AdminUserController.php @@ -24,7 +24,7 @@ class AdminUserController extends AdminController { $crud = $this->baseCRUD() ->headerToolbar([ - // $this->createTypeButton('drawer', 'lg')->visible(Admin::user()->can('admin.system.admin_users.create')), + $this->createTypeButton('drawer', 'lg')->visible(Admin::user()->can('admin.system.admin_users.create')), ...$this->baseHeaderToolBar(), ]) ->bulkActions([]) diff --git a/app/Admin/Services/EmployeeService.php b/app/Admin/Services/EmployeeService.php index ac5a6f2..5258774 100644 --- a/app/Admin/Services/EmployeeService.php +++ b/app/Admin/Services/EmployeeService.php @@ -136,9 +136,12 @@ class EmployeeService extends BaseService } // 删除管理员 - $adminUserIds = Employee::whereIn('id', $ids)->pluck('admin_user_id')->implode(','); + $adminUserIds = Employee::whereIn('id', $ids)->pluck('admin_user_id'); + if (in_array(1, $adminUserIds->toArray())) { + admin_abort('admin 账户, 不能删除'); + } $adminUserService = AdminUserService::make(); - $adminUserService->delete($adminUserIds); + $adminUserService->delete($adminUserIds->implode(',')); // 删除职位关联 DB::table('employee_jobs')->whereIn('employee_id', $ids)->delete();