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

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

Browse Source
This commit is contained in:
yaooo 2023-11-16 13:54:27 +08:00
commit f4daf29d0c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -390,15 +390,15 @@ class CompanyController extends BaseAdminController
// 根据street码查询所属镇农科公司 // 根据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_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) { 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)) {
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']??'',