diff --git a/app/api/controller/CompanyController.php b/app/api/controller/CompanyController.php index 175209270..3499e2143 100644 --- a/app/api/controller/CompanyController.php +++ b/app/api/controller/CompanyController.php @@ -194,12 +194,17 @@ class CompanyController extends BaseApiController public function shareholder_info(){ // $params = $this->request->param(); $find=Company::where('id',$this->userInfo['company_id'])->field('shareholder_money,village')->find()->toArray(); + $find['is_contract']=0; + $find['check_status']=0; if($find){ - $contract=Contract::where('party_b',$this->userInfo['company_id'])->where('contract_type',40)->field('contract_url,create_time')->find(); + $contract=Contract::where('party_b',$this->userInfo['company_id'])->where('contract_type',40)->field('contract_url,create_time,check_status,status')->find(); if($contract){ $find['contract_url']='https://worker-task.lihaink.cn'.$contract['contract_url']; $find['contract_time']=$contract['create_time']; - $find['is_contract']=1; + $find['check_status']=$contract['check_status']; + if($contract['status']==1){ + $find['is_contract']=1; + } } $village_info=Company::where('village',$find['village'])->where('company_type',17)->find(); if($village_info){ @@ -208,7 +213,6 @@ class CompanyController extends BaseApiController $find['is_amount_turned']=0; } }else{ - $find['is_contract']=0; $find['contract_url']=''; $find['contract_time']=''; $find['is_amount_turned']=0;