내정보 멀티 테턴트 표시

adminfront/src/lib/adminApi.ts

@@ -354,6 +354,7 @@ export type UserSummary = {
   status: string;
   companyCode?: string;
   tenant?: TenantSummary;
+  joinedTenants?: TenantSummary[]; // [New] 다중 소속 테넌트 목록
   metadata?: Record<string, unknown>;
   department?: string;
   position?: string;

adminfront/src/lib/tenantTree.ts

@@ -24,30 +24,45 @@ export function buildTenantFullTree(
     });
   }
 
-  // Build initial children relations
+  const visitedDuringBuild = new Set<string>();
+  // Build initial children relations and prevent simple cycles
   for (const t of allTenants) {
-    if (t.parentId) {
+    if (t.parentId && t.parentId !== t.id) {
       const parent = tenantMap.get(t.parentId);
       const child = tenantMap.get(t.id);
       if (parent && child) {
+        // Simple cycle prevention during build: don't add if it creates an immediate loop
         parent.children.push(child);
       }
     }
   }
 
-  // Function to calculate recursive counts
+  const visitedForCalc = new Set<string>();
+  // Function to calculate recursive counts with cycle protection
   const calculateRecursive = (node: TenantNode): number => {
+    if (visitedForCalc.has(node.id)) {
+      console.warn(`Circular dependency detected in tenant tree for ID: ${node.id}`);
+      return 0; // Prevent infinite loop
+    }
+    visitedForCalc.add(node.id);
+
     let total = node.memberCount || 0;
     for (const child of node.children) {
       total += calculateRecursive(child);
     }
     node.recursiveMemberCount = total;
+    
+    // We don't remove from visitedForCalc here because a tree shouldn't have 
+    // multiple paths to the same node anyway (it's a tree, not a graph).
+    // If it were a DAG, we'd need different logic, but for a tree with parentIds,
+    // a node should only be visited once.
     return total;
   };
 
   // Calculate for all top-level nodes (those without parent)
   for (const node of tenantMap.values()) {
     if (!node.parentId) {
+      visitedForCalc.clear();
       calculateRecursive(node);
     }
   }
@@ -57,6 +72,7 @@ export function buildTenantFullTree(
     const base = tenantMap.get(rootId);
     if (base) {
       // Re-calculate specifically for our current tenant to be sure if it wasn't a global root
+      visitedForCalc.clear();
       calculateRecursive(base);
       return { currentBase: base, subTree: base.children };
     }