diff --git a/app/adminapi/logic/finance/FinanceReturnedMoneyLogic.php b/app/adminapi/logic/finance/FinanceReturnedMoneyLogic.php index 60617c4fd..0e866f7de 100644 --- a/app/adminapi/logic/finance/FinanceReturnedMoneyLogic.php +++ b/app/adminapi/logic/finance/FinanceReturnedMoneyLogic.php @@ -122,9 +122,16 @@ class FinanceReturnedMoneyLogic extends BaseLogic $financeReturnedMoney = FinanceReturnedMoney::findOrEmpty($params['id']); $financeReturnedMoney->contract; $financeReturnedMoney->custom; - $financeReturnedMoney->document = $financeReturnedMoney->contract->document; - $financeReturnedMoney->project = $financeReturnedMoney->document->project; - unset($financeReturnedMoney->contract->document, $financeReturnedMoney->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); + } $financeReturnedMoney->annex = json_decode($financeReturnedMoney->annex, true); return $financeReturnedMoney->toArray(); }