feat(user): 更新用户层级树状图功能

- 移除SharedProsperityUserRepository的测试代码
- 添加UserRepository获取用户树的测试逻辑
- 修改getUserForTree方法增加parentId参数支持
- 实现以指定用户为根节点的树状结构返回
- 添加parentId字段到树节点结构中
- 优化树构建逻辑支持从任意节点开始展示子树

app/common/repositories/user/UserRepository.php

@@ -4924,9 +4924,10 @@ 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');
@@ -4942,7 +4943,38 @@ class UserRepository extends BaseRepository
         }
         
         // 构建树
-        $tree = $this->buildTree($users, 0, $field, $idToName);
+        $tree = $this->buildTree($users, $parentId, $field, $idToName);
+        
+        // 如果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']. '(' . $parentUser['account'] .')' ?? ('用户' . $parentUser['uid']),
+                    'parent' => $userParentName,
+                    'parentId' => $userParentId > 0 ? $userParentId : null,
+                    'children' => $tree // 子节点就是之前构建的树
+                ];
+                return [$parentNode];
+            } else {
+                // 如果找不到对应的用户，返回空数组
+                return [];
+            }
+        }
+        
         return $tree;
     }
     
@@ -4963,6 +4995,7 @@ class UserRepository extends BaseRepository
                 $node = [
                     'name' => $user['nickname']. '(' . $user['account'] .')' ?? ('用户' . $user['uid']),
                     'parent' => $parentId == 0 ? null : ($idToName[$parentId] ?? null),
+                    'parentId' => $parentId == 0 ? null : $parentId,
                     'children' => $children
                 ];
                 $branch[] = $node;

app/controller/api/Test.php

@@ -9,15 +9,15 @@ class Test
 {
     public function test()
     {
-        /** @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 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,43);
+        var_dump(json_encode($list));
         // return app('json')->success($list);
     }
 }