From 6f3f36f87b19335186ed12ebe596911c8cdf3b8a Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Mon, 25 Sep 2023 14:44:27 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=AE=A1=E7=90=86?=
=?UTF-8?q?=E5=85=AC=E5=8F=B8=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/api/controller/CompanyController.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/api/controller/CompanyController.php b/app/api/controller/CompanyController.php
index 91e3405ff..83148b9ad 100644
--- a/app/api/controller/CompanyController.php
+++ b/app/api/controller/CompanyController.php
@@ -352,9 +352,9 @@ class CompanyController extends BaseApiController
*/
public function street_company(){
$street=$this->request->param('street_code');
- $company = Company::where('street', $street)->where('company_type',41)->find();
+ $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['company_name'],'organization_code'=>$company['organization_code']]);
+ return $this->success('ok',['title'=>$company[0]['company_name'],'organization_code'=>$company[0]['organization_code']]);
}else{
return $this->fail('没有镇管理公司');
}
From 8d439540b6012015fad01a486d8158ed9afaadc7 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Mon, 25 Sep 2023 16:04:45 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=B7=9F=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/api/controller/CompanyController.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/api/controller/CompanyController.php b/app/api/controller/CompanyController.php
index 83148b9ad..a83217ed2 100644
--- a/app/api/controller/CompanyController.php
+++ b/app/api/controller/CompanyController.php
@@ -352,7 +352,7 @@ 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);
+ $company=Db::query("select * from la_company where company_type=:company_type and FIND_IN_SET(:street,responsible_area)", ['company_type' => 16,'street'=>$street], true);
if($company){
return $this->success('ok',['title'=>$company[0]['company_name'],'organization_code'=>$company[0]['organization_code']]);
}else{