pdkj
/
store-manage
generated from liutk/owl-admin-base
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: pdkj:02e8fa41963c816868d7541da00db53e09a47f7f
Branches Tags
pdkj:main
..
compare: pdkj:fe3e214227310f14a7d16964fd1330d16576bf87
Branches Tags
pdkj:main

No commits in common. "02e8fa41963c816868d7541da00db53e09a47f7f" and "fe3e214227310f14a7d16964fd1330d16576bf87" have entirely different histories.
02e8fa4196 ... fe3e214227

2 changed files with 3 additions and 6 deletions
Show Stats Expand all files Collapse all files

2
app/Admin/Controllers/System/AdminUserController.php
View File

@ -24,7 +24,7 @@ class AdminUserController extends AdminController
{ {
$crud = $this->baseCRUD() $crud = $this->baseCRUD()
->headerToolbar([ ->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(), ...$this->baseHeaderToolBar(),
]) ])
->bulkActions([]) ->bulkActions([])

7
app/Admin/Services/EmployeeService.php
View File

@ -136,12 +136,9 @@ class EmployeeService extends BaseService
} }
// 删除管理员 // 删除管理员
$adminUserIds = Employee::whereIn('id', $ids)->pluck('admin_user_id'); $adminUserIds = Employee::whereIn('id', $ids)->pluck('admin_user_id')->implode(',');
if (in_array(1, $adminUserIds->toArray())) {
admin_abort('admin 账户, 不能删除');
}
$adminUserService = AdminUserService::make(); $adminUserService = AdminUserService::make();
$adminUserService->delete($adminUserIds->implode(',')); $adminUserService->delete($adminUserIds);
// 删除职位关联 // 删除职位关联
DB::table('employee_jobs')->whereIn('employee_id', $ids)->delete(); DB::table('employee_jobs')->whereIn('employee_id', $ids)->delete();