From 51c5e7e50317b0c70b36f99f9a5a84e6abe0ac54 Mon Sep 17 00:00:00 2001
From: vine_liutk <961510893@qq.com>
Date: Thu, 3 Nov 2022 13:41:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=9F=BA=E5=9C=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/AgriculturalBaseController.php | 1 +
 app/Http/Resources/AgriculturalBaseResource.php     | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/app/Http/Controllers/AgriculturalBaseController.php b/app/Http/Controllers/AgriculturalBaseController.php
index d3d7d0d..f513c3a 100644
--- a/app/Http/Controllers/AgriculturalBaseController.php
+++ b/app/Http/Controllers/AgriculturalBaseController.php
@@ -56,6 +56,7 @@ class AgriculturalBaseController extends Controller
 
     public function show(AgriculturalBase $agriculturalBasic)
     {
+        $agriculturalBasic->load('crops');
         return $this->json(AgriculturalBaseResource::make($agriculturalBasic));
     }
 
diff --git a/app/Http/Resources/AgriculturalBaseResource.php b/app/Http/Resources/AgriculturalBaseResource.php
index 3feb768..9bad80e 100644
--- a/app/Http/Resources/AgriculturalBaseResource.php
+++ b/app/Http/Resources/AgriculturalBaseResource.php
@@ -18,6 +18,7 @@ class AgriculturalBaseResource extends JsonResource
             'id' => $this->id,
             'name' => $this->name,
             'address' => $this->address ?? '',
+            'person' => $this->person ?? '',
             'address_lat' => $this->address_lat ?? '',
             'address_lng' => $this->address_lng ?? '',
             'description' => $this->description ?? '',
@@ -25,6 +26,7 @@ class AgriculturalBaseResource extends JsonResource
             'areas' => ($this->areas ?? 0.00),//占地面积
             'workforce' => $this->workforce ?? 0,//人数
             'cultivated' =>$this->cultivated ?? 0,//种养殖面积
+            'crops' => CropResource::collection($this->whenLoaded('crops')),
         ];
     }
 }