diff --git a/app/adminapi/lists/contract/ContractLists.php b/app/adminapi/lists/contract/ContractLists.php index 637d0b542..ad1b7c38d 100644 --- a/app/adminapi/lists/contract/ContractLists.php +++ b/app/adminapi/lists/contract/ContractLists.php @@ -73,6 +73,7 @@ class ContractLists extends BaseAdminDataLists implements ListsSearchInterface ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) ->select()->each(function ($item, $key) { + halt($item); if($item->type==1){ $item->party_b_name=Db::name('company')->where('id',$item->party_b)->value('company_name'); }else{ diff --git a/app/common/logic/contract/ContractLogic.php b/app/common/logic/contract/ContractLogic.php index 2b854e099..a0bf38cc7 100644 --- a/app/common/logic/contract/ContractLogic.php +++ b/app/common/logic/contract/ContractLogic.php @@ -170,6 +170,12 @@ class ContractLogic extends BaseLogic $model->contract_no = time(); $model->create_time = time(); } + if($data['party_a']<=0){ + return self::setError('甲方不能为空'); + } + if($data['party_b']<=0){ + return self::setError('乙方不能为空'); + } if($data['type']==1){ if($data['party_a'] == $data['party_b']){ return self::setError('甲方和乙方不能是同一个公司');