diff --git a/app/api/controller/CompanyController.php b/app/api/controller/CompanyController.php index 83c21337c..566d3317f 100644 --- a/app/api/controller/CompanyController.php +++ b/app/api/controller/CompanyController.php @@ -355,13 +355,25 @@ class CompanyController extends BaseApiController * 查询镇农科公司 */ public function street_company(){ - $street=$this->request->param('street_code'); - $company=Db::query("select * from la_company where company_type=:company_type and FIND_IN_SET(:street,responsible_area)", ['company_type' => 41,'street'=>$street], true); - if($company){ - return $this->success('ok',['title'=>$company[0]['company_name'],'organization_code'=>$company[0]['organization_code']]); - }else{ - return $this->fail('当前区域无镇农科公司'); + $street=$this->request->param('street_code', ''); + $area=$this->request->param('area_code', ''); + if (!empty($street)) { + $company=Db::query("select * from la_company where company_type=:company_type and FIND_IN_SET(:street,responsible_area)", ['company_type' => 41,'street'=>$street], true); + if($company){ + return $this->success('ok',['title'=>$company[0]['company_name'],'organization_code'=>$company[0]['organization_code']]); + }else{ + return $this->fail('当前区域无镇农科公司'); + } } + if(!empty($area)) { + $company=Db::query("select * from la_company where company_type=:company_type and FIND_IN_SET(:street,responsible_area)", ['company_type' => 15,'area'=>$area], true); + if($company){ + return $this->success('ok',['title'=>$company[0]['company_name'],'organization_code'=>$company[0]['organization_code']]); + }else{ + return $this->fail('当前区域无供投公司'); + } + } + }