|
|
@@ -528,21 +528,33 @@ class SharedProsperityUserRepository extends BaseRepository
|
|
528
|
528
|
*/
|
|
529
|
529
|
public function getUserTree($userId)
|
|
530
|
530
|
{
|
|
531
|
|
- /** @var SharedProsperityUserDao $userDao */
|
|
532
|
|
- $userDao = app()->make(SharedProsperityUserDao::class);
|
|
|
531
|
+ /** @var SharedProsperityUserDao $shareUserDao */
|
|
|
532
|
+ $shareUserDao = app()->make(SharedProsperityUserDao::class);
|
|
533
|
533
|
|
|
534
|
534
|
// 获取所有下级用户ID(包括自己)
|
|
535
|
|
- $subordinateIds = $userDao->getAllSubordinateUserIds($userId, true);
|
|
|
535
|
+ $subordinateIds = $shareUserDao->getAllSubordinateUserIds($userId, true);
|
|
536
|
536
|
if (empty($subordinateIds)) {
|
|
537
|
537
|
return [];
|
|
538
|
538
|
}
|
|
539
|
539
|
|
|
540
|
540
|
// 获取这些共富用户的基本信息(包含parent_id)
|
|
541
|
|
- $sharedUsers = $userDao->getSharedProsperityUserEntityListByUserIdList($subordinateIds);
|
|
|
541
|
+ $sharedUsers = $shareUserDao->getSharedProsperityUserEntityListByUserIdList($subordinateIds);
|
|
|
542
|
+
|
|
542
|
543
|
if (empty($sharedUsers)) {
|
|
543
|
544
|
return [];
|
|
544
|
545
|
}
|
|
545
|
|
-
|
|
|
546
|
+
|
|
|
547
|
+ // 用户身份
|
|
|
548
|
+ $partnerLevel = [
|
|
|
549
|
+ 0 => '用户',
|
|
|
550
|
+ 1 => '一星合伙人',
|
|
|
551
|
+ 2 => '二星合伙人',
|
|
|
552
|
+ 3 => '三星合伙人',
|
|
|
553
|
+ 4 => '钻石合伙人',
|
|
|
554
|
+ 5 => '总裁合伙人',
|
|
|
555
|
+ 6 => '联席主席团',
|
|
|
556
|
+ ];
|
|
|
557
|
+
|
|
546
|
558
|
// 获取用户昵称映射
|
|
547
|
559
|
$userIds = array_map(function ($entity) {
|
|
548
|
560
|
return $entity->getUserId();
|
|
|
@@ -552,7 +564,8 @@ class SharedProsperityUserRepository extends BaseRepository
|
|
552
|
564
|
$userInfos = $userDao->getUserEntityListByUidList($userIds);
|
|
553
|
565
|
$idToName = [];
|
|
554
|
566
|
foreach ($userInfos as $userInfo) {
|
|
555
|
|
- $idToName[$userInfo->getUid()] = $userInfo->getNickname() . '(' . $userInfo->account .')' ?? ('用户' . $userInfo->getUid());
|
|
|
567
|
+ $sharedUserInfo = $shareUserDao->getSharedProsperityUserEntityListByUserIdList([$userInfo->getUid()]);
|
|
|
568
|
+ $idToName[$userInfo->getUid()] = $userInfo->getNickname() . '(' . $userInfo->account .')(身份:' . $partnerLevel[$sharedUserInfo[0]->getPartnerLevel()] . ')' ?? ('用户' . $userInfo->getUid());
|
|
556
|
569
|
}
|
|
557
|
570
|
|
|
558
|
571
|
// 构建节点数组
|