From c8675a6bd19143b3276afc8f61b40a081aee4619 Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Thu, 16 Nov 2023 11:46:21 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=B8=82=E7=BA=A7=E4=BE=9B=E5=BA=94?=
 =?UTF-8?q?=E9=93=BE=E5=95=86=E6=88=B7=E5=9B=BA=E5=AE=9A=E7=94=B1=E6=B3=B8?=
 =?UTF-8?q?=E5=B7=9E=E5=B8=82=E6=B5=B7=E4=B9=8B=E5=86=9C=E7=A7=91=E6=8A=80?=
 =?UTF-8?q?=E6=9C=89=E9=99=90=E5=85=AC=E5=8F=B8=E5=AE=A1=E6=89=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/adminapi/controller/CompanyController.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/adminapi/controller/CompanyController.php b/app/adminapi/controller/CompanyController.php
index ffb797efe..d8095b13f 100644
--- a/app/adminapi/controller/CompanyController.php
+++ b/app/adminapi/controller/CompanyController.php
@@ -390,15 +390,15 @@ class CompanyController extends BaseAdminController
 
             // 根据street码查询所属镇农科公司
             $company_select=Db::query("select * from la_company where company_type=:company_type and FIND_IN_SET(:street,responsible_area)", ['company_type' => 41,'street'=>$params['street']], true);
+            $company=$company_select[0];
             // 市级供应链直接和海之农签约
             if (isset($params['type_id']) && $params['type_id'] == 12) {
-                $company_select = Company::where(['company_name' => '泸州市海之农科技有限公司'])->find();
+                $company = Company::where(['company_name' => '泸州市海之农科技有限公司'])->find();
             }
-
-            if(empty($company_select)) {
+            if(empty($company)) {
                 throw new Exception('当前区域无镇农科公司');
             }
-            $company=$company_select[0];
+
             $data = [
                 'mer_intention_id' => $params['mer_intention_id']??'', // 商城商户入驻申请id，签约完成后回调使用
                 'company_name' => $params['company_name']??'',