From 49d68f4eeed98654908ee848b83a63589008e30f Mon Sep 17 00:00:00 2001
From: weiz <weiz@lihai.com>
Date: Mon, 23 Oct 2023 17:55:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=86=9C=E6=88=B7=E5=9C=9F?=
 =?UTF-8?q?=E5=9C=B0=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/InformationController.php | 29 ++++++++++++++++++--
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/app/api/controller/InformationController.php b/app/api/controller/InformationController.php
index 2768cdd58..955b2ab0e 100644
--- a/app/api/controller/InformationController.php
+++ b/app/api/controller/InformationController.php
@@ -12,7 +12,7 @@ use think\response\Json;
 
 class InformationController extends BaseApiController
 {
-	public array $notNeedLogin = ['farmerInfo'];
+	public array $notNeedLogin = ['farmerInfo','farmerLandInfo'];
 	
     public function list()
     {
@@ -139,10 +139,13 @@ class InformationController extends BaseApiController
 		//获取参数
 		$params = $this->request->post(['user_id']);
 		if(empty($params['user_id'])){
-			return $this->fail('参数错误');
+			return $this->fail('参数错误_worker');
 		}
 		//获取农户信息
-		$farmerInfo = UserInformationg::where('id', $params['user_id'])->field('id,create_user_id,company_id,name,phone,area_id,street_id,village_id,brigade_id,area_id area_name,street_id street_name,village_id village_name,brigade_id brigade_name')->find()->toArray();
+		$farmerInfo = UserInformationg::where('id', $params['user_id'])->field('id,create_user_id,company_id,name,phone,area_id,street_id,village_id,brigade_id,area_id area_name,street_id street_name,village_id village_name,brigade_id brigade_name')->findOrEmpty()->toArray();
+		if(empty($farmerInfo)){
+			return $this->fail('用户不存在_worker');
+		}
 		unset($farmerInfo['area_id'],$farmerInfo['street_id'],$farmerInfo['village_id'],$farmerInfo['brigade_id']);
 		$data = UserInformationgDemand::field('id,category_child,data')->where('information_id', $params['user_id'])->where('category_id',6)->where('category_child','in','7,32')->order('id', 'desc')->select()->toArray();
 		//是否是种植户
@@ -191,4 +194,24 @@ class InformationController extends BaseApiController
 		}
 		return $this->success('请求成功',$farmerInfo);
 	}
+	
+	//获取农户土地信息
+	public function farmerLandInfo(): Json
+	{
+		//获取参数
+		$params = $this->request->post(['user_id','land_id']);
+		if(empty($params['user_id']) || empty($params['land_id'])){
+			return $this->fail('参数错误_worker');
+		}
+		//获取农户信息
+		$data = UserInformationgDemand::field('id,data')->where('id',$params['land_id'])->where('information_id', $params['user_id'])->where('category_id',6)->where('category_child','7')->findOrEmpty()->toArray();
+		if(empty($data)){
+			return $this->fail('数据不存在_worker');
+		}
+		$resData = [
+			'land_id' => $data['id'],
+			'land_area' => $data['data']['area']
+		];
+		return $this->success('请求成功',$resData);
+	}
 }