From 1e2b4f1d154a30d1556b6280a67076c51a9cae67 Mon Sep 17 00:00:00 2001 From: yaooo <272523191@qq.com> Date: Mon, 25 Dec 2023 11:00:46 +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/FinanceReturnedRecordLogic.php | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) 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