diff --git a/app/adminapi/logic/finance/FinanceReturnedRecordLogic.php b/app/adminapi/logic/finance/FinanceReturnedRecordLogic.php index 21187f68f..f3b5b0ea9 100644 --- a/app/adminapi/logic/finance/FinanceReturnedRecordLogic.php +++ b/app/adminapi/logic/finance/FinanceReturnedRecordLogic.php @@ -137,9 +137,17 @@ class FinanceReturnedRecordLogic extends BaseLogic $financeReturnedRecord->contract; $financeReturnedRecord->custom; $financeReturnedRecord->plan = $financeReturnedRecord->returnedPlan; - $financeReturnedRecord->document = $financeReturnedRecord->contract->document; - $financeReturnedRecord->project = $financeReturnedRecord->document->project; - unset($financeReturnedRecord->returnedPlan, $financeReturnedRecord->contract->document, $financeReturnedRecord->document->project); + $financeReturnedMoney->document = null; + $financeReturnedMoney->project = null; + if (!empty($financeReturnedMoney->contract->document)) { + $financeReturnedMoney->document = $financeReturnedMoney->contract->document; + unset($financeReturnedMoney->contract->document); + } + if (!empty($financeReturnedMoney->document->project)) { + $financeReturnedMoney->project = $financeReturnedMoney->document->project; + unset($financeReturnedMoney->document->project); + } + unset($financeReturnedRecord->returnedPlan); return $financeReturnedRecord->toArray(); } } \ No newline at end of file