diff --git a/app/adminapi/validate/contract/ContractValidate.php b/app/adminapi/validate/contract/ContractValidate.php index ccc9404e6..432dc63cd 100644 --- a/app/adminapi/validate/contract/ContractValidate.php +++ b/app/adminapi/validate/contract/ContractValidate.php @@ -209,11 +209,10 @@ class ContractValidate extends BaseValidate public function checkReturnedMoney($value): bool|string { - $detail = $value;//json_decode($value,true); - if(empty($detail) || !is_array($detail)){ + if(!empty($value) && !is_array($value)){ return '回款计划数据格式错误'; } - foreach($detail as $v) { + foreach($value as $v) { if(isset($v['id']) && $v['id'] != ''){ $info = FinanceReturnedMoney::where('id',$v['id'])->findOrEmpty(); if($info->isEmpty()){ diff --git a/app/adminapi/validate/contract/ProcurementContractValidate.php b/app/adminapi/validate/contract/ProcurementContractValidate.php index 9afd27068..82db60932 100644 --- a/app/adminapi/validate/contract/ProcurementContractValidate.php +++ b/app/adminapi/validate/contract/ProcurementContractValidate.php @@ -185,11 +185,10 @@ class ProcurementContractValidate extends BaseValidate public function checkProcurementContractDetail($value): bool|string { - $detail = $value;//json_decode($value,true); - if(empty($detail) || !is_array($detail)){ + if(!empty($value) && !is_array($value)){ return '采购合同明细数据格式错误'; } - foreach($detail as $v) { + foreach($value as $v) { if(isset($v['id']) && $v['id'] != ''){ $data_detail = ProcurementContractDetail::where('id',$v['id'])->findOrEmpty(); if($data_detail->isEmpty()){ @@ -232,11 +231,10 @@ class ProcurementContractValidate extends BaseValidate public function checkPaymentPlan($value): bool|string { - $detail = $value;//json_decode($value,true); - if(empty($detail) || !is_array($detail)){ + if(!empty($value) && !is_array($value)){ return '付款计划据格式错误'; } - foreach($detail as $v) { + foreach($value as $v) { if(isset($v['id']) && $v['id'] != ''){ $data_detail = FinancePaymentPlan::where('id',$v['id'])->findOrEmpty(); if($data_detail->isEmpty()){ diff --git a/app/adminapi/validate/quotation/QuotationValidate.php b/app/adminapi/validate/quotation/QuotationValidate.php index 76364011e..7172b73c9 100644 --- a/app/adminapi/validate/quotation/QuotationValidate.php +++ b/app/adminapi/validate/quotation/QuotationValidate.php @@ -123,7 +123,7 @@ class QuotationValidate extends BaseValidate public function checkQuotationDetail($value): bool|string { - if(empty($value) || !is_array($value)){ + if(!empty($value) && !is_array($value)){ return '报价明细数据格式错误'; } foreach($value as $k=>$v) {