Merge branch 'mkm' of https://gitea.lihaink.cn/mkm/TaskSystem into dev

app/adminapi/controller/CompanyController.php

@@ -376,16 +376,17 @@ class CompanyController extends BaseAdminController
 //            $isQueryStatus = false; // 需要进一步查询是否已做过企业认证
 //            // $master_email为空表示没有做过认证
 //            if($master_email){
-//                $isQueryStatus = true;
+//                $isQueryStatus = true;asdasd,fsdfdf
 //            }else{
 //                $master_email=substr(md5(uniqid()),rand(0, 22),10)."@lihai.com";
 //            }
 
             // 根据street码查询所属镇农科公司
-            $company = Company::where(['street' => $params['street'], 'company_type' => 41])->find();
-            if(empty($company)) {
+            $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);
+            if(empty($company_select)) {
                 throw new Exception('当前区域无镇农科公司');
             }
+            $company=$company_select[0];
             $data = [
                 'mer_intention_id' => $params['mer_intention_id']??'', // 商城商户入驻申请id，签约完成后回调使用
                 'company_name' => $params['company_name']??'',