diff --git a/app/Services/ReceivingService.php b/app/Services/ReceivingService.php index 89a34ae..35ffa59 100644 --- a/app/Services/ReceivingService.php +++ b/app/Services/ReceivingService.php @@ -16,6 +16,7 @@ public function index(array $params): LengthAwarePaginator $tenantId = $this->tenantId(); $query = Receiving::query() + ->with('creator:id,name') ->where('tenant_id', $tenantId); // 검색어 필터 @@ -41,12 +42,12 @@ public function index(array $params): LengthAwarePaginator } } - // 날짜 범위 필터 + // 날짜 범위 필터 (작성일 기준) if (! empty($params['start_date'])) { - $query->where('receiving_date', '>=', $params['start_date']); + $query->whereDate('created_at', '>=', $params['start_date']); } if (! empty($params['end_date'])) { - $query->where('receiving_date', '<=', $params['end_date']); + $query->whereDate('created_at', '<=', $params['end_date']); } // 정렬