diff --git a/app/Http/Controllers/CropYieldController.php b/app/Http/Controllers/CropYieldController.php index 08f0121..e3def5f 100644 --- a/app/Http/Controllers/CropYieldController.php +++ b/app/Http/Controllers/CropYieldController.php @@ -160,7 +160,11 @@ class CropYieldController extends Controller $staticCropIds[] = $crop->id; if ($crop->extends) { $i = 0; - $extends = json_decode($crop->extends, true); + if(is_array($crop->extends)){ + $extends = $crop->extends; + }else{ + $extends = json_decode($crop->extends, true); + } foreach ($extends as $item) { $i++; $_key = 'extend_'.$i; diff --git a/app/Http/Resources/CropYieldListResource.php b/app/Http/Resources/CropYieldListResource.php index c298015..6e8c764 100644 --- a/app/Http/Resources/CropYieldListResource.php +++ b/app/Http/Resources/CropYieldListResource.php @@ -29,8 +29,8 @@ class CropYieldListResource extends JsonResource 'yield' => $this->formatNumber($this->yield).$this->whenLoaded('crop', function () { return $this->crop?->unit; }, ''), - 'output' => $this->formatNumber($this->output), - 'cultivated' => $this->formatNumber($this->cultivated), + 'output' => $this->formatNumber($this->output).'元', + 'cultivated' => $this->formatNumber($this->cultivated).'亩', 'extends' => $this->extends, 'created_by' => $this->whenLoaded('createdBy', function () { return $this->createdBy?->name;