diff --git a/app/Services/SalesCommissionService.php b/app/Services/SalesCommissionService.php index ec0f254f..94f1e24a 100644 --- a/app/Services/SalesCommissionService.php +++ b/app/Services/SalesCommissionService.php @@ -33,11 +33,9 @@ public function getCommissions(array $filters = [], int $perPage = 20): LengthAw { $query = SalesCommission::query() ->with([ - 'tenant', 'partner.user', 'partner.referrer.user', - 'manager', 'referrerPartner.user', - 'management.tenant', 'management.tenantProspect.registeredBy.salesPartner.referrer.user', - 'management.salesPartner.user', 'management.salesPartner.referrer.user', - 'management.manager', + 'tenant', 'partner.user.parent', 'manager', 'referrerPartner.user', + 'management.tenant', 'management.tenantProspect.registeredBy.parent', + 'management.salesPartner.user.parent', 'management.manager', ]); // 상태 필터 diff --git a/resources/views/finance/settlement/partials/commission/table.blade.php b/resources/views/finance/settlement/partials/commission/table.blade.php index 5a04339f..e8ea661e 100644 --- a/resources/views/finance/settlement/partials/commission/table.blade.php +++ b/resources/views/finance/settlement/partials/commission/table.blade.php @@ -112,10 +112,15 @@ class="commission-checkbox rounded border-gray-300 text-emerald-600 focus:ring-e @php - $referrerName = $commission->referrerPartner?->user?->name - ?? $commission->partner?->referrer?->user?->name - ?? $commission->management?->salesPartner?->referrer?->user?->name - ?? $commission->management?->tenantProspect?->registeredBy?->salesPartner?->referrer?->user?->name; + // 유치파트너 = 영업파트너의 상위자 (user→parent) + $referrerName = $commission->referrerPartner?->user?->name; + if (!$referrerName) { + // 영업파트너 user를 찾아서 parent 확인 + $partnerUser = $commission->partner?->user + ?? $commission->management?->salesPartner?->user + ?? $commission->management?->tenantProspect?->registeredBy; + $referrerName = $partnerUser?->parent?->name; + } @endphp @if ($referrerName)
{{ $referrerName }}