조직현황 구조변경. 총괄센터삼안 실 조직 삽입확인

orgfront/src/features/orgchart/pickerTree.ts

@@ -1,6 +1,7 @@
 import type { TenantSummary, UserSummary } from "../../lib/adminApi";
 import { type TenantNode, buildTenantFullTree } from "../../lib/tenantTree";
 import type { OrgPickerTreeNode } from "./pickerTypes";
+import { filterTenantsByVisibility } from "./tenantVisibility";
 import { getOrgChartUserDisplayName } from "./userDisplay";
 
 function getUserTenantSlug(user: UserSummary) {
@@ -28,6 +29,23 @@ function getCompanyGroupId(node: TenantNode, allTenants: TenantSummary[]) {
   return cursor?.type === "COMPANY_GROUP" ? cursor.id : node.id;
 }
 
+function isHanmacFamilyCompanyGroup(tenant: TenantSummary) {
+  return (
+    tenant.type.toUpperCase() === "COMPANY_GROUP" &&
+    tenant.slug.toLowerCase() === "hanmac-family"
+  );
+}
+
+function findTenantByRef(tenants: TenantSummary[], ref?: string) {
+  const normalizedRef = ref?.trim().toLowerCase();
+  if (!normalizedRef) return undefined;
+
+  return (
+    tenants.find((tenant) => tenant.slug.toLowerCase() === normalizedRef) ??
+    tenants.find((tenant) => tenant.id === ref)
+  );
+}
+
 function tenantToPickerNode(
   tenant: TenantNode,
   usersBySlug: Map<string, UserSummary[]>,
@@ -58,12 +76,34 @@ function tenantToPickerNode(
 
 function findTenantNode(
   roots: TenantNode[],
-  tenantId: string,
+  tenantRef: string,
 ): TenantNode | undefined {
+  const findBySlug = (node: TenantNode): TenantNode | undefined => {
+    if (node.slug.toLowerCase() === tenantRef.trim().toLowerCase()) {
+      return node;
+    }
+    for (const child of node.children) {
+      const match = findBySlug(child);
+      if (match) return match;
+    }
+    return undefined;
+  };
+  const findById = (node: TenantNode): TenantNode | undefined => {
+    if (node.id === tenantRef) return node;
+    for (const child of node.children) {
+      const match = findById(child);
+      if (match) return match;
+    }
+    return undefined;
+  };
+
   for (const root of roots) {
-    if (root.id === tenantId) return root;
-    const child = findTenantNode(root.children, tenantId);
-    if (child) return child;
+    const slugMatch = findBySlug(root);
+    if (slugMatch) return slugMatch;
+  }
+  for (const root of roots) {
+    const idMatch = findById(root);
+    if (idMatch) return idMatch;
   }
   return undefined;
 }
@@ -79,7 +119,10 @@ export function buildOrgPickerTree({
   rootTenantId?: string;
   tenantId?: string;
 }) {
-  const visibleTenants = tenants.filter(isOrgFrontTenantType);
+  const visibleTenants = filterTenantsByVisibility(
+    tenants.filter(isOrgFrontTenantType),
+    "internal",
+  );
   const usersBySlug = new Map<string, UserSummary[]>();
   for (const user of users) {
     if (user.status !== "active") continue;
@@ -91,7 +134,8 @@ export function buildOrgPickerTree({
   }
 
   const companyGroup =
-    visibleTenants.find((tenant) => tenant.id === rootTenantId) ??
+    findTenantByRef(visibleTenants, rootTenantId) ??
+    visibleTenants.find(isHanmacFamilyCompanyGroup) ??
     visibleTenants.find((tenant) => tenant.type === "COMPANY_GROUP") ??
     visibleTenants.find((tenant) => !tenant.parentId);