0.0.1.2

app/api/trees/route.ts

@@ -18,37 +18,58 @@ export async function GET(req: NextRequest) {
       return NextResponse.json({ error: "未授权" }, { status: 401 })
     }
 
-    const trees = await prisma.familyTree.findMany({
-      where: {
-        OR: [
-          { ownerId: session.user.id },
-          {
-            collaborators: {
-              some: {
-                userId: session.user.id
-              }
-            }
-          }
-        ]
-      },
+    // 1. 查询拥有的家族树
+    const ownedTrees = await prisma.familyTree.findMany({
+      where: { ownerId: session.user.id },
       include: {
         owner: {
-          select: {
-            id: true,
-            name: true,
-            email: true,
-          }
+          select: { id: true, name: true, email: true }
         },
         _count: {
-          select: {
-            members: true,
-            collaborators: true,
+          select: { members: true, collaborators: true }
+        }
+      },
+      orderBy: { updatedAt: 'desc' }
+    })
+
+    // 2. 查询协作的家族树
+    const collaboratedRelations = await prisma.treeCollaborator.findMany({
+      where: { userId: session.user.id },
+      include: {
+        tree: {
+          include: {
+            owner: {
+              select: { id: true, name: true, email: true }
+            },
+            _count: {
+              select: { members: true, collaborators: true }
+            }
           }
         }
       },
-      orderBy: {
-        updatedAt: 'desc'
-      }
+      orderBy: { invitedAt: 'desc' }
+    })
+
+    // 3. 格式化数据
+    const formattedOwnedTrees = ownedTrees.map(tree => ({
+      ...tree,
+      currentUserRole: "OWNER"
+    }))
+
+    const formattedCollaboratedTrees = collaboratedRelations.map(relation => ({
+      ...relation.tree,
+      currentUserRole: relation.role
+    }))
+
+    // 4. 合并列表
+    const trees = [...formattedOwnedTrees, ...formattedCollaboratedTrees]
+
+    console.log('🌳 GET /api/trees 返回数据:', {
+      userId: session.user.id,
+      ownedCount: formattedOwnedTrees.length,
+      collaboratedCount: formattedCollaboratedTrees.length,
+      totalCount: trees.length,
+      trees: trees.map(t => ({ id: t.id, name: t.name, role: t.currentUserRole }))
     })
 
     return NextResponse.json({ trees })