Merge remote-tracking branch 'origin/master'

app/common/repositories/shared/SharedProsperityUserRepository.php

@@ -528,21 +528,33 @@ class SharedProsperityUserRepository extends BaseRepository
      */
     public function getUserTree($userId)
     {
-        /** @var SharedProsperityUserDao $userDao */
-        $userDao = app()->make(SharedProsperityUserDao::class);
+        /** @var SharedProsperityUserDao $shareUserDao */
+        $shareUserDao = app()->make(SharedProsperityUserDao::class);
         
         // 获取所有下级用户ID（包括自己）
-        $subordinateIds = $userDao->getAllSubordinateUserIds($userId, true);
+        $subordinateIds = $shareUserDao->getAllSubordinateUserIds($userId, true);
         if (empty($subordinateIds)) {
             return [];
         }
         
         // 获取这些共富用户的基本信息（包含parent_id）
-        $sharedUsers = $userDao->getSharedProsperityUserEntityListByUserIdList($subordinateIds);
+        $sharedUsers = $shareUserDao->getSharedProsperityUserEntityListByUserIdList($subordinateIds);
+
         if (empty($sharedUsers)) {
             return [];
         }
-        
+
+        // 用户身份
+        $partnerLevel = [
+            0 => '用户',
+            1 => '一星合伙人',
+            2 => '二星合伙人',
+            3 => '三星合伙人',
+            4 => '钻石合伙人',
+            5 => '总裁合伙人',
+            6 => '联席主席团',
+        ];
+
         // 获取用户昵称映射
         $userIds = array_map(function ($entity) {
             return $entity->getUserId();
@@ -552,7 +564,8 @@ class SharedProsperityUserRepository extends BaseRepository
         $userInfos = $userDao->getUserEntityListByUidList($userIds);
         $idToName = [];
         foreach ($userInfos as $userInfo) {
-            $idToName[$userInfo->getUid()] = $userInfo->getNickname()  . '(' . $userInfo->account .')' ?? ('用户' . $userInfo->getUid());
+            $sharedUserInfo = $shareUserDao->getSharedProsperityUserEntityListByUserIdList([$userInfo->getUid()]);
+            $idToName[$userInfo->getUid()] = $userInfo->getNickname()  . '(' . $userInfo->account .')(身份：' . $partnerLevel[$sharedUserInfo[0]->getPartnerLevel()] . ')' ?? ('用户' . $userInfo->getUid());
         }
         
         // 构建节点数组

app/common/repositories/user/UserRepository.php

@@ -4924,25 +4924,68 @@ class UserRepository extends BaseRepository
     /**
      * 获取用户层级的树状图
      * @param string $field 关系字段名，如 'spread_uid'
-     * @return array 树状结构，格式：[{name: '张三', parent: null, children: [...]}]
+     * @param int $parentId 父ID，默认为0表示根节点
+     * @return array 树状结构，格式：[{name: '张三', parent: null, parentId: null, children: [...]}]
      */
-    public function getUserForTree($field)
+    public function getUserForTree($field,$parentId = 0)
     {
         // 获取所有用户数据
-        $users = $this->dao->selectWhere(['is_del'=>0], 'uid,' . $field . ',nickname,account');
+        $users = $this->dao->selectWhere(['is_del'=>0], 'uid,' . $field . ',nickname,account,user_group');
         if (empty($users)) {
             return [];
         }
         $users = $users->toArray();
-        
+
+        // 用户身份
+        $userGroup = [
+            1 => '用户',
+            2 => '业务员',
+            3 => '业务经理',
+            4 => '初级合伙人',
+            5 => '中级合伙人',
+            6 => '高级合伙人',
+            7 => '董事',
+        ];
+
         // 创建uid到昵称的映射
         $idToName = [];
         foreach ($users as $user) {
-            $idToName[$user['uid']] = $user['nickname'] . '(' . $user['account'] .')' ?? ('用户' . $user['uid']);
+            $idToName[$user['uid']] = $user['nickname'] . '(' . $user['account'] .')(身份：' . $userGroup[$user['user_group']] . ')' ?? ('用户' . $user['uid']);
         }
         
         // 构建树
-        $tree = $this->buildTree($users, 0, $field, $idToName);
+        $tree = $this->buildTree($users, $parentId, $field, $idToName, $userGroup);
+
+        // 如果parentId大于0，需要返回以该用户为根节点的树
+        if ($parentId > 0) {
+            // 查找parentId对应的用户
+            $parentUser = null;
+            foreach ($users as $user) {
+                if ($user['uid'] == $parentId) {
+                    $parentUser = $user;
+                    break;
+                }
+            }
+            
+            if ($parentUser) {
+                // 获取该用户的父节点信息
+                $userParentId = $parentUser[$field] ?? 0;
+                $userParentName = $userParentId > 0 ? ($idToName[$userParentId] ?? null) : null;
+                
+                // 构建以该用户为根节点的树
+                $parentNode = [
+                    'name' => $parentUser['nickname']. '(' .')(身份：' . $userGroup[$user['user_group']] . ')' ?? ('用户' . $parentUser['uid']),
+                    'parent' => $userParentName,
+                    'parentId' => $userParentId > 0 ? $userParentId : null,
+                    'children' => $tree // 子节点就是之前构建的树
+                ];
+                return [$parentNode];
+            } else {
+                // 如果找不到对应的用户，返回空数组
+                return [];
+            }
+        }
+        
         return $tree;
     }
     
@@ -4954,15 +4997,16 @@ class UserRepository extends BaseRepository
      * @param array $idToName uid到昵称的映射
      * @return array
      */
-    private function buildTree($users, $parentId, $field, $idToName)
+    private function buildTree($users, $parentId, $field, $idToName,$userGroup)
     {
         $branch = [];
         foreach ($users as $user) {
             if ($user[$field] == $parentId) {
-                $children = $this->buildTree($users, $user['uid'], $field, $idToName);
+                $children = $this->buildTree($users, $user['uid'], $field, $idToName,$userGroup);
                 $node = [
-                    'name' => $user['nickname']. '(' . $user['account'] .')' ?? ('用户' . $user['uid']),
+                    'name' => $user['nickname']. '(' . $user['account'] .')(身份：' . $userGroup[$user['user_group']] . ')' ?? ('用户' . $user['uid']),
                     'parent' => $parentId == 0 ? null : ($idToName[$parentId] ?? null),
+                    'parentId' => $parentId == 0 ? null : $parentId,
                     'children' => $children
                 ];
                 $branch[] = $node;

app/controller/api/Test.php

@@ -16,7 +16,7 @@ class Test
         // $field = request()->param('field');
         // /** @var UserRepository $userRepository */
         // $userRepository = app()->make(UserRepository::class);
-        // $list = $userRepository->getUserForTree($field);
+        // $list = $userRepository->getUserForTree($field,43);
         // var_dump(json_encode($list));
         // return app('json')->success($list);
     }