fix:유치파트너를 영업파트너의 parent(상위자)로 표시
- 유치파트너 = 영업파트너 user의 parent_id (User→parent 관계) - partner→user→parent, salesPartner→user→parent, registeredBy→parent 순 fallback - eager loading 정리 (불필요한 referrer 체인 제거, parent 관계 추가) Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -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',
|
||||
]);
|
||||
|
||||
// 상태 필터
|
||||
|
||||
@@ -112,10 +112,15 @@ class="commission-checkbox rounded border-gray-300 text-emerald-600 focus:ring-e
|
||||
</td>
|
||||
<td class="px-4 py-3">
|
||||
@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)
|
||||
<div class="text-sm text-gray-900">{{ $referrerName }}</div>
|
||||
|
||||
Reference in New Issue
Block a user