diff --git a/app/Admin/Controllers/Store/EmployeeController.php b/app/Admin/Controllers/Store/EmployeeController.php index 0624e2b..c54e780 100644 --- a/app/Admin/Controllers/Store/EmployeeController.php +++ b/app/Admin/Controllers/Store/EmployeeController.php @@ -39,6 +39,7 @@ class EmployeeController extends AdminController ->filterDefaultVisible() ->columns([ amisMake()->TableColumn()->name('store.title')->label(__('employee.store_id')), + amisMake()->TableColumn()->name('admin_user.username')->label(__('admin.username')), amisMake()->TableColumn()->name('name')->label(__('employee.name')), amisMake()->TableColumn()->name('avatar')->label(__('employee.avatar'))->type('avatar')->src('${avatar}'), amisMake()->TableColumn()->name('jobs')->label(__('employee.jobs'))->type('each')->items(amisMake()->Tag()->label('${name}')), diff --git a/app/Admin/Services/StoreEmployeeService.php b/app/Admin/Services/StoreEmployeeService.php index 0cff400..337e1c3 100644 --- a/app/Admin/Services/StoreEmployeeService.php +++ b/app/Admin/Services/StoreEmployeeService.php @@ -8,7 +8,7 @@ use Illuminate\Support\Facades\Validator; class StoreEmployeeService extends BaseService { - protected array $withRelationships = ['store', 'jobs']; + protected array $withRelationships = ['store', 'jobs', 'adminUser']; protected string $modelName = Employee::class; diff --git a/app/Http/Controllers/Api/WorkflowController.php b/app/Http/Controllers/Api/WorkflowController.php index e14aaf4..deffc80 100644 --- a/app/Http/Controllers/Api/WorkflowController.php +++ b/app/Http/Controllers/Api/WorkflowController.php @@ -120,7 +120,7 @@ class WorkflowController extends Controller } else { $check = WorkflowCheck::where('subject_type', $subjectType)->where('subject_id', $id)->firstOrFail(); } - $logs = $check->logs()->sort()->get(); + $logs = $check->logs()->with(['checkUser'])->sort()->get(); return WorkflowLogResource::collection($logs); } diff --git a/app/Http/Resources/WorkflowLogResource.php b/app/Http/Resources/WorkflowLogResource.php index b08eebd..48827fd 100644 --- a/app/Http/Resources/WorkflowLogResource.php +++ b/app/Http/Resources/WorkflowLogResource.php @@ -29,6 +29,7 @@ class WorkflowLogResource extends JsonResource 'check_status_text' => $this->check_status->text(), 'sort' => $this->sort, 'check' => WorkflowCheckResource::make($this->whenLoaded('check')), + 'check_user' => EmployeeResource::make($this->whenLoaded('checkUser')), ]; } }