diff --git a/app/Admin/Services/WorkFlowService.php b/app/Admin/Services/WorkFlowService.php index d5d1227..85fa559 100644 --- a/app/Admin/Services/WorkFlowService.php +++ b/app/Admin/Services/WorkFlowService.php @@ -211,9 +211,7 @@ class WorkFlowService extends BaseService } $checkValue = [$user->id]; if ($user->jobs && $user->jobs->count() > 0) { - $max = $user->jobs->max('sort'); - $jobs = Keyword::where('parent_key', 'job')->where('sort', '<', $max)->get(); - foreach($user->jobs->merge($jobs) as $item) { + foreach($user->jobs as $item) { array_push($checkValue, $user->store_id . '-' . $item->key); } } diff --git a/app/Http/Resources/EmployeePromotionResource.php b/app/Http/Resources/EmployeePromotionResource.php index 96bceb2..735d096 100644 --- a/app/Http/Resources/EmployeePromotionResource.php +++ b/app/Http/Resources/EmployeePromotionResource.php @@ -31,6 +31,7 @@ class EmployeePromotionResource extends JsonResource 'promotion_status_text' => $this->promotion_status->text(), 'employee_data' => $this->employee_data, 'created_at' => $this->created_at->timestamp, + 'created_format' => $this->created_at->format('Y-m-d H:i:s'), 'workflow_check' => WorkflowCheckResource::make($this->whenLoaded('workflow')), ]; diff --git a/app/Models/WorkflowLog.php b/app/Models/WorkflowLog.php index ab4de25..838f78e 100644 --- a/app/Models/WorkflowLog.php +++ b/app/Models/WorkflowLog.php @@ -40,9 +40,7 @@ class WorkflowLog extends Model $checkValue = [$user->id]; $userJobs = $user->jobs; if ($userJobs && $userJobs->count() > 0) { - $max = $userJobs->max('sort'); - $jobs = Keyword::where('parent_key', 'job')->where('sort', '<=', $max)->get(); - foreach($userJobs->merge($jobs)->unique('key') as $item) { + foreach($userJobs->unique('key') as $item) { array_push($checkValue, $user->store_id . '-' . $item->key); } }