From 6b3979132dc1c694a76e033718bc8a3835448c17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EB=B3=B4=EA=B3=A4?= Date: Thu, 19 Feb 2026 13:34:41 +0900 Subject: [PATCH] =?UTF-8?q?fix:=ED=8C=8C=ED=8A=B8=EB=84=88=20=ED=83=80?= =?UTF-8?q?=EC=9E=85=20=ED=8C=90=EB=B3=84=20=EB=A1=9C=EC=A7=81=20=EA=B0=9C?= =?UTF-8?q?=EC=84=A0=20(management=E2=86=92registered=5Fby=20=EC=88=9C=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit management.sales_partner_id가 미설정된 경우 registered_by(User ID)로 SalesPartner를 조회하여 partner_type 결정 Co-Authored-By: Claude Opus 4.6 --- .../Sales/AdminProspectController.php | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/Sales/AdminProspectController.php b/app/Http/Controllers/Sales/AdminProspectController.php index 863fd974..bd4908c0 100644 --- a/app/Http/Controllers/Sales/AdminProspectController.php +++ b/app/Http/Controllers/Sales/AdminProspectController.php @@ -4,6 +4,7 @@ use App\Http\Controllers\Controller; use App\Models\Sales\SalesCommission; +use App\Models\Sales\SalesPartner; use App\Models\Sales\SalesScenarioChecklist; use App\Models\Sales\SalesTenantManagement; use App\Models\Sales\TenantProspect; @@ -149,11 +150,16 @@ private function getIndexData(Request $request): array if ($management) { $commission = SalesCommission::where('management_id', $management->id)->first(); $prospect->commission = $commission; - $prospect->partner_type = $management->salesPartner?->partner_type ?? 'individual'; } else { $prospect->commission = null; - $prospect->partner_type = 'individual'; } + + // 파트너 타입: management → registered_by 순으로 조회 + $partnerType = $management?->salesPartner?->partner_type; + if (!$partnerType && $prospect->registered_by) { + $partnerType = SalesPartner::where('user_id', $prospect->registered_by)->value('partner_type'); + } + $prospect->partner_type = $partnerType ?? 'individual'; } // 두 시나리오 모두 100%인 것만 필터링 @@ -196,11 +202,16 @@ private function getIndexData(Request $request): array if ($management) { $commission = SalesCommission::where('management_id', $management->id)->first(); $prospect->commission = $commission; - $prospect->partner_type = $management->salesPartner?->partner_type ?? 'individual'; } else { $prospect->commission = null; - $prospect->partner_type = 'individual'; } + + // 파트너 타입: management → registered_by 순으로 조회 + $partnerType = $management?->salesPartner?->partner_type; + if (!$partnerType && $prospect->registered_by) { + $partnerType = SalesPartner::where('user_id', $prospect->registered_by)->value('partner_type'); + } + $prospect->partner_type = $partnerType ?? 'individual'; } }