Merge branch 'dev-sc-260204'

app/common/repositories/shared/SharedProsperityUserRepository.php

@@ -520,4 +520,115 @@ class SharedProsperityUserRepository extends BaseRepository
 
         return array_unique($subordinateIds);
     }
+
+    /**
+     * 获取用户树
+     * @param int $userId 用户ID
+     * @return array 用户树，格式：[{name: '张三', parent: null, children: [...]}]
+     */
+    public function getUserTree($userId)
+    {
+        /** @var SharedProsperityUserDao $userDao */
+        $userDao = app()->make(SharedProsperityUserDao::class);
+        
+        // 获取所有下级用户ID（包括自己）
+        $subordinateIds = $userDao->getAllSubordinateUserIds($userId, true);
+        if (empty($subordinateIds)) {
+            return [];
+        }
+        
+        // 获取这些共富用户的基本信息（包含parent_id）
+        $sharedUsers = $userDao->getSharedProsperityUserEntityListByUserIdList($subordinateIds);
+        if (empty($sharedUsers)) {
+            return [];
+        }
+        
+        // 获取用户昵称映射
+        $userIds = array_map(function ($entity) {
+            return $entity->getUserId();
+        }, $sharedUsers);
+        /** @var UserDao $userDao */
+        $userDao = app()->make(UserDao::class);
+        $userInfos = $userDao->getUserEntityListByUidList($userIds);
+        $idToName = [];
+        foreach ($userInfos as $userInfo) {
+            $idToName[$userInfo->getUid()] = $userInfo->getNickname()  . '(' . $userInfo->account .')' ?? ('用户' . $userInfo->getUid());
+        }
+        
+        // 构建节点数组
+        $nodes = [];
+        foreach ($sharedUsers as $sharedUser) {
+            $nodes[] = [
+                'user_id' => $sharedUser->getUserId(),
+                'parent_id' => $sharedUser->getParentId(),
+                'name' => $idToName[$sharedUser->getUserId()] ?? ('用户' . $sharedUser->getUserId()),
+            ];
+        }
+        
+        // 构建树，以传入的用户为根节点
+        $rootNode = $this->findNode($nodes, $userId);
+        if (!$rootNode) {
+            return [];
+        }
+        $tree = [
+            'name' => $rootNode['name'],
+            'parent' => null,
+            'children' => $this->buildSharedTree($nodes, $userId)
+        ];
+        return [$tree];
+    }
+    
+    /**
+     * 递归构建共富用户树
+     * @param array $nodes 节点数组，每个节点包含 user_id, parent_id, name
+     * @param int $parentId 父ID
+     * @return array
+     */
+    private function buildSharedTree($nodes, $parentId)
+    {
+        $branch = [];
+        foreach ($nodes as $node) {
+            if ($node['parent_id'] == $parentId) {
+                $children = $this->buildSharedTree($nodes, $node['user_id']);
+                $branch[] = [
+                    'name' => $node['name'],
+                    'parent' => $this->findNodeName($nodes, $parentId) ?? null,
+                    'children' => $children
+                ];
+            }
+        }
+        return $branch;
+    }
+    
+    /**
+     * 根据user_id查找节点名称
+     * @param array $nodes
+     * @param int $userId
+     * @return string|null
+     */
+    private function findNodeName($nodes, $userId)
+    {
+        foreach ($nodes as $node) {
+            if ($node['user_id'] == $userId) {
+                return $node['name'];
+            }
+        }
+        return null;
+    }
+    
+    /**
+     * 根据user_id查找节点
+     * @param array $nodes
+     * @param int $userId
+     * @return array|null
+     */
+    private function findNode($nodes, $userId)
+    {
+        foreach ($nodes as $node) {
+            if ($node['user_id'] == $userId) {
+                return $node;
+            }
+        }
+        return null;
+    }
 }

app/controller/api/Test.php

@@ -1,6 +1,7 @@
 <?php
 
 namespace app\controller\api;
+use app\common\repositories\shared\SharedProsperityUserRepository;
 use app\common\repositories\user\UserRepository;
 use app\traits\GzcApiRequest;
 
@@ -8,11 +9,15 @@ class Test
 {
     public function test()
     {
-        $field = request()->param('field');
-        /** @var UserRepository $userRepository */
-        $userRepository = app()->make(UserRepository::class);
-        $list = $userRepository->getUserForTree($field);
+        /** @var SharedProsperityUserRepository $userRepository */
+        $userRepository = app()->make(SharedProsperityUserRepository::class);
+        $list = $userRepository->getUserTree(43);
         var_dump(json_encode($list));
+        // $field = request()->param('field');
+        // /** @var UserRepository $userRepository */
+        // $userRepository = app()->make(UserRepository::class);
+        // $list = $userRepository->getUserForTree($field);
+        // var_dump(json_encode($list));
         // return app('json')->success($list);
     }
 }