diff --git a/app/Http/Resources/RegionResource.php b/app/Http/Resources/RegionResource.php index ef52a22..4f79e8f 100644 --- a/app/Http/Resources/RegionResource.php +++ b/app/Http/Resources/RegionResource.php @@ -23,7 +23,7 @@ class RegionResource extends JsonResource 'description' => $this->description, 'category_id' => $this->category_id, 'category' => RegionCategoryResource::make($this->whenLoaded('category')), - 'current_plant' => RegionPlantResource::make($this->whenLoaded('currentPlant')) ?: [], + 'current_plant' => RegionPlantResource::make($this->whenLoaded('currentPlant')), ]; } } diff --git a/app/Models/Region.php b/app/Models/Region.php index fe6bf3e..f93e89d 100644 --- a/app/Models/Region.php +++ b/app/Models/Region.php @@ -56,7 +56,7 @@ class Region extends Model // 当前种植 public function currentPlant() { - return $this->hasOne(RegionPlantLog::class, 'region_id')->orderBy('start_at', 'desc'); + return $this->hasOne(RegionPlantLog::class, 'region_id')->whereNull('end_at')->orderBy('start_at', 'desc'); } // 收货记录