resolve: solve some problems

TencentBlueKing · Jan 20, 2025 · 9ba1d6e · 9ba1d6e
1 parent 173fb49
commit 9ba1d6e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 15 deletions.
diff --git a/src/bk-user/bkuser/biz/organization.py b/src/bk-user/bkuser/biz/organization.py
@@ -126,17 +126,11 @@ def get_tenant_department_parent_id_map(tenant_departments: List[TenantDepartmen
         获取部门的父部门 ID 映射
         """
 
-        # 预加载部门对应的租户部门
-        tenant_dept_id_map = {
-            (data_source_dept_id, tenant_id): dept_id
-            for (data_source_dept_id, tenant_id, dept_id) in TenantDepartment.objects.values_list(
-                "data_source_department_id", "tenant_id", "id"
-            )
-        }
+        dept_ids = [dept.data_source_department_id for dept in tenant_departments]
 
-        return {
-            dept.id: tenant_dept_id_map.get(
-                (dept.data_source_department.department_relation.parent_id, dept.tenant_id)
-            )
-            for dept in tenant_departments
-        }
+        relations = DataSourceDepartmentRelation.objects.filter(department_id__in=dept_ids)
+
+        # 部门 ID -> 父部门 ID 映射
+        parent_id_map = {rel.department_id: rel.parent_id for rel in relations}
+
+        return {dept.id: parent_id_map.get(dept.data_source_department_id) for dept in tenant_departments}
diff --git a/src/bk-user/support-files/apidocs/en/list_department_descendant.md b/src/bk-user/support-files/apidocs/en/list_department_descendant.md
@@ -15,7 +15,7 @@
 
 ```
 // URL Path & Query Parameters
-/api/v3/open/tenant/departments/2/childrens/?level=2&page=1&page_size=5
+/api/v3/open/tenant/departments/2/descendants/?level=2&page=1&page_size=5
 ```
 
 ### Response Example for Status Code 200

diff --git a/src/bk-user/support-files/apidocs/zh/list_department_descendant.md b/src/bk-user/support-files/apidocs/zh/list_department_descendant.md
@@ -15,7 +15,7 @@
 
 ```
 // URL Path & Query 参数
-/api/v3/open/tenant/departments/2/childrens/?level=2&page=1&page_size=5
+/api/v3/open/tenant/departments/2/descendants/?level=2&page=1&page_size=5
 ```
 
 ### 状态码 200 的响应示例