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

Merge pull request '修改小组公司上级签约公司的类型判断，由镇街公司改为镇农科公司' (#152) from zhangwei into dev

Browse Source 
Reviewed-on: #152
This commit is contained in:
weiz 2023-11-06 14:25:58 +08:00
commit c5193d8b78
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/api/controller/VehicleController.php
View File

@ -58,7 +58,7 @@ class VehicleController extends BaseApiController
return $this->fail('数据不存在');
}
//判断是否是镇街公司
if($party_b['company_type'] != 16){
if($party_b['company_type'] != 41){
return ['code'=>0,'msg'=>'非镇街公司不能签约'];
}
//发送生成合同给物流信息
@ -237,11 +237,11 @@ class VehicleController extends BaseApiController
}
//获取签约信息
$contract = Contract::where('party_b',$this->userInfo['company_id'])->where('signing_timer',2)->findOrEmpty();
if(empty($contract) || empty($party_a)){
if($contract->isEmpty()){
return $this->fail('未找到签约镇街公司');
}
$party_a = Company::field('id,company_name,master_name,master_phone,master_email,is_contract,organization_code,company_type')->where('id',$contract['party_a'])->find();
if($party_a['company_type'] != 16){
if($party_a['company_type'] != 41){
return $this->fail('不能与非镇街公司签约');
}
if($party_a['is_contract'] != 1){
@ -386,7 +386,7 @@ class VehicleController extends BaseApiController
if(empty($company)){
return $this->fail('数据错误');
}
if($company['company_type'] != 16){
if($company['company_type'] != 41){
return $this->fail('非镇街公司不能访问');
}
//获取小组服务公司申请信息
@ -587,7 +587,7 @@ class VehicleController extends BaseApiController
if(empty($company)){
return $this->fail('请求错误');
}
if($company['company_type'] != 16){
if($company['company_type'] != 41){
return $this->fail('非镇街公司不能访问');
}
$data = VehicleContract::field('id,contract_no,contract_url,status,create_time,update_time')->where('contract_logistic_id','<>',0)->where('company_b_id',$company['id'])->select();