diff --git a/app/adminapi/lists/marketing/MarketingContractChangeLists.php b/app/adminapi/lists/marketing/MarketingContractChangeLists.php index 594cbdd63..4dd5e55d8 100644 --- a/app/adminapi/lists/marketing/MarketingContractChangeLists.php +++ b/app/adminapi/lists/marketing/MarketingContractChangeLists.php @@ -66,10 +66,10 @@ ->order(['id' => 'desc']) ->select()->each(function ($data) { $contract = MarketingContract::field('contract_name,contract_type,business_nature,signed_amount')->where('id', $data['contract_id'])->findOrEmpty(); - $data['contract_name'] = $contract?->contract_name; - $data['contract_type'] = $contract?->contract_type_text; - $data['business_nature'] = $contract?->business_nature_text; - $data['signed_amount'] = $contract?->signed_amount; + $data['contract_name'] = !$contract->isEmpty() ? $contract['contract_name'] : ''; + $data['contract_type'] = !$contract->isEmpty() ? $contract->contract_type_text : ''; + $data['business_nature'] = !$contract->isEmpty() ? $contract->business_nature_text : ''; + $data['signed_amount'] = !$contract->isEmpty() ? $contract['signed_amount'] : ''; }) ->toArray(); } diff --git a/app/adminapi/logic/marketing/MarketingContractChangeLogic.php b/app/adminapi/logic/marketing/MarketingContractChangeLogic.php index 5ede14185..f38c83dc3 100644 --- a/app/adminapi/logic/marketing/MarketingContractChangeLogic.php +++ b/app/adminapi/logic/marketing/MarketingContractChangeLogic.php @@ -112,10 +112,10 @@ { $data = MarketingContractChange::withoutField('create_time,update_time,delete_time')->findOrEmpty($params['id']); $contract = MarketingContract::field('contract_name,contract_type,business_nature,signed_amount')->where('id', $data['contract_id'])->findOrEmpty(); - $data['contract_name'] = $contract?->contract_name; - $data['contract_type'] = $contract?->contract_type_text; - $data['business_nature'] = $contract?->business_nature_text; - $data['signed_amount'] = $contract?->signed_amount; + $data['contract_name'] = !$contract->isEmpty() ? $contract['contract_name'] : ''; + $data['contract_type'] = !$contract->isEmpty() ? $contract->contract_type_text : ''; + $data['business_nature'] = !$contract->isEmpty() ? $contract->business_nature_text : ''; + $data['signed_amount'] = !$contract->isEmpty() ? $contract['signed_amount'] : ''; return $data->toArray(); } } \ No newline at end of file