diff --git a/app/Admin/Controllers/Hr/EmployeeController.php b/app/Admin/Controllers/Hr/EmployeeController.php index c7893f8..bb523f5 100644 --- a/app/Admin/Controllers/Hr/EmployeeController.php +++ b/app/Admin/Controllers/Hr/EmployeeController.php @@ -77,7 +77,8 @@ class EmployeeController extends AdminController ->source(admin_url('api/keywords/tree-list').'?parent_key='.Employee::JOB_KEY) ->labelField('name') ->valueField('key') - ->joinValues(), + ->extractValue(true) + ->joinValues(false), amisMake()->DateControl()->name('join_at')->label(__('employee.join_at'))->format('YYYY-MM-DD'), amisMake()->TextControl()->name('remarks')->label(__('employee.remarks')), amisMake()->ImageControl()->name('prize_images')->label(__('employee.prize_images')) diff --git a/app/Admin/Services/EmployeeService.php b/app/Admin/Services/EmployeeService.php index 8db4852..0420cd5 100644 --- a/app/Admin/Services/EmployeeService.php +++ b/app/Admin/Services/EmployeeService.php @@ -70,7 +70,15 @@ class EmployeeService extends BaseService // 职位修改 if (isset($data['jobs'])) { - $jobs = is_array($data['jobs']) ? $data['jobs'] : explode(',', $data['jobs']); + if (is_array($data['jobs'])) { + if (is_array($data['jobs'][0])) { + $jobs = array_column($data['jobs'], 'key'); + } else { + $jobs = $data['jobs']; + } + } else { + $jobs = explode(',', $data['jobs']); + } $model->jobs()->sync($jobs); } diff --git a/database/seeders/AdminPermissionSeeder.php b/database/seeders/AdminPermissionSeeder.php index b55555c..0a12062 100644 --- a/database/seeders/AdminPermissionSeeder.php +++ b/database/seeders/AdminPermissionSeeder.php @@ -67,7 +67,7 @@ class AdminPermissionSeeder extends Seeder 'levels' => [ 'name' => '门店等级', 'icon' => 'carbon:skill-level', - 'uri' => '/store/levels?parent_key=store_levels', + 'uri' => '/store/levels?parent_key=store_level', 'resource' => true, 'order' => 4,