From 50fcffe52fe901696471ea0036c204bd579c77f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=B3=B4=EA=B3=A4?=
 <lightone2017@codebridge-x.com>
Date: Fri, 6 Feb 2026 10:16:03 +0900
Subject: [PATCH] =?UTF-8?q?fix:=EC=9E=AC=EB=AC=B4=20=EB=8C=80=EC=8B=9C?=
 =?UTF-8?q?=EB=B3=B4=EB=93=9C=20=EC=B5=9C=EA=B7=BC=20=EA=B1=B0=EB=9E=98?=
 =?UTF-8?q?=EB=82=B4=EC=97=AD=EC=97=90=20=EC=88=98=EC=A0=95=EB=90=9C=20?=
 =?UTF-8?q?=EC=A0=81=EC=9A=94=20=EB=B0=98=EC=98=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- BankTransactionOverride 데이터 병합 로직 추가
- 수정된 적요/내용이 있으면 오버라이드 적용

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
---
 .../Finance/FinanceDashboardController.php    | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/app/Http/Controllers/Finance/FinanceDashboardController.php b/app/Http/Controllers/Finance/FinanceDashboardController.php
index 75cf89c9..d2649848 100644
--- a/app/Http/Controllers/Finance/FinanceDashboardController.php
+++ b/app/Http/Controllers/Finance/FinanceDashboardController.php
@@ -4,6 +4,7 @@
 
 use App\Http\Controllers\Controller;
 use App\Models\Barobill\BankTransaction as BarobillBankTransaction;
+use App\Models\Barobill\BankTransactionOverride;
 use App\Models\Barobill\CardTransaction as BarobillCardTransaction;
 use App\Models\Finance\BankAccount;
 use App\Models\Finance\FundSchedule;
@@ -50,6 +51,30 @@ public function index(): View
             ->limit(10)
             ->get();
 
+        // 오버라이드 데이터 병합 (수정된 적요/내용)
+        if ($recentTransactions->isNotEmpty()) {
+            $uniqueKeys = $recentTransactions->map(fn($t) => $t->unique_key)->toArray();
+            $overrides = BankTransactionOverride::getByUniqueKeys($tenantId, $uniqueKeys);
+
+            $recentTransactions = $recentTransactions->map(function ($transaction) use ($overrides) {
+                $override = $overrides->get($transaction->unique_key);
+                if ($override) {
+                    // 수정된 적요가 있으면 적용
+                    if ($override->modified_summary) {
+                        $transaction->summary = $override->modified_summary;
+                    }
+                    // 수정된 내용이 있으면 적용
+                    if ($override->modified_cast) {
+                        $transaction->cast = $override->modified_cast;
+                    }
+                    $transaction->is_overridden = true;
+                } else {
+                    $transaction->is_overridden = false;
+                }
+                return $transaction;
+            });
+        }
+
         // 최근 카드 사용내역 (바로빌 - 최근 7일, 최대 10건)
         $recentCardTransactions = BarobillCardTransaction::where('tenant_id', $tenantId)
             ->whereBetween('use_date', [$weekAgo, $today])