From 98ec0f40df8519c12a2c980360640750c94c90d5 Mon Sep 17 00:00:00 2001 From: yaooo <272523191@qq.com> Date: Mon, 25 Dec 2023 10:57:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=BB=86=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logic/finance/FinanceReturnedMoneyLogic.php | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) 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(); }