From cffa0a3ef59f07420f9687e8e3fcd292cf1c2f50 Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Sat, 23 Dec 2023 17:34:59 +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

---
 app/adminapi/logic/expense/ExpenseReimbursementLogic.php | 4 ++++
 app/common/model/expense/ExpenseReimbursementDetail.php  | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/adminapi/logic/expense/ExpenseReimbursementLogic.php b/app/adminapi/logic/expense/ExpenseReimbursementLogic.php
index 145035308..219dc8566 100644
--- a/app/adminapi/logic/expense/ExpenseReimbursementLogic.php
+++ b/app/adminapi/logic/expense/ExpenseReimbursementLogic.php
@@ -184,11 +184,15 @@ class ExpenseReimbursementLogic extends BaseLogic
     {
         $expenseReimbursement = ExpenseReimbursement::findOrEmpty($params['id']);
         $expenseReimbursement->detail;
+        foreach ($expenseReimbursement->detail as &$item) {
+            $item->subject;
+        }
         $expenseReimbursement->invoice;
         $expenseReimbursement->custom;
         $expenseReimbursement->org;
         $expenseReimbursement->dept;
         $expenseReimbursement->annex = json_decode($expenseReimbursement->annex, true);
+        unset($item);
         return $expenseReimbursement->toArray();
     }
 }
\ No newline at end of file
diff --git a/app/common/model/expense/ExpenseReimbursementDetail.php b/app/common/model/expense/ExpenseReimbursementDetail.php
index c4e2679bf..245a2effa 100644
--- a/app/common/model/expense/ExpenseReimbursementDetail.php
+++ b/app/common/model/expense/ExpenseReimbursementDetail.php
@@ -30,5 +30,8 @@ class ExpenseReimbursementDetail extends BaseModel
     protected $name = 'expense_reimbursement_detail';
     protected $deleteTime = 'delete_time';
 
-    
+    public function subject()
+    {
+        return $this->belongsTo(\app\common\model\cost\CostSubject::class, 'cost_subject_id');
+    }
 }
\ No newline at end of file