mkm/TaskSystem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
mkm 2023-09-27 16:13:03 +08:00
commit 37f9d18652
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/adminapi/controller/CompanyController.php
View File

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