diff --git a/app/api/controller/CompanyController.php b/app/api/controller/CompanyController.php index 3372c0d91..e5a29b1ae 100644 --- a/app/api/controller/CompanyController.php +++ b/app/api/controller/CompanyController.php @@ -196,7 +196,7 @@ class CompanyController extends BaseApiController $find=Company::where('id',$this->userInfo['company_id'])->field('is_contract,shareholder_money,village')->find()->toArray(); if($find &&$find['is_contract']==1){ $contract=Contract::where('party_b',$this->userInfo['company_id'])->field('contract_url,create_time')->find(); - $find['contract_url']='https://worker-task.lihaink.cn/uploads/contract/'.$contract['contract_url']; + $find['contract_url']='https://worker-task.lihaink.cn'.$contract['contract_url']; $find['contract_time']=$contract['create_time']; $village_info=Company::where('village',$find['village'])->where('company_type',17)->find(); if($village_info){ diff --git a/app/common/logic/task_template/TaskTemplateLogic.php b/app/common/logic/task_template/TaskTemplateLogic.php index 27acfe89b..c89b71a4f 100644 --- a/app/common/logic/task_template/TaskTemplateLogic.php +++ b/app/common/logic/task_template/TaskTemplateLogic.php @@ -62,12 +62,12 @@ class TaskTemplateLogic extends BaseLogic return false; } $money_two=TaskTemplate::where('company_id', $params['company_id'])->sum('money_two'); - if($money_two+$params['money']>200){ + if($money_two+$params['money_two']>200){ self::setError('任务模板二阶段合计金额不能大于任务调度金额'); return false; } $money_three=TaskTemplate::where('company_id', $params['company_id'])->sum('money_three'); - if($money_three+$params['money']>200){ + if($money_three+$params['money_three']>200){ self::setError('任务模板长期合计金额不能大于任务调度金额'); return false; }