From bb27293aba5bd85f6ccce53eec94f39572d67222 Mon Sep 17 00:00:00 2001 From: maggieyyy <61950669+maggieyyy@users.noreply.github.com> Date: Fri, 1 Nov 2024 14:23:05 +0800 Subject: [PATCH] fix: Modify department children type --- frontend/packages/core/src/pages/team/TeamInsideMember.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/packages/core/src/pages/team/TeamInsideMember.tsx b/frontend/packages/core/src/pages/team/TeamInsideMember.tsx index 7e1dfe4a..97408e9d 100644 --- a/frontend/packages/core/src/pages/team/TeamInsideMember.tsx +++ b/frontend/packages/core/src/pages/team/TeamInsideMember.tsx @@ -20,7 +20,7 @@ import WithPermission from "@common/components/aoplatform/WithPermission.tsx"; import { $t } from "@common/locales/index.ts"; export const getDepartmentWithMember = (department:(DepartmentListItem & {type?:'department'|'member'})[],departmentMap:Map) : (DepartmentWithMemberItem | undefined)[] =>{ - return department.map((x:DepartmentListItem & {type?:'department'|'member'})=>{ + return department?.map((x:DepartmentListItem & {type?:'department'|'member'})=>{ const res = ({ ...x, key:x.id, @@ -28,7 +28,7 @@ export const getDepartmentWithMember = (department:(DepartmentListItem & {type?: type: x.type || 'department', children:((x.type === 'member' || (!x.children||x.children.length === 0 )&& (!departmentMap.get(x.id) || departmentMap.get(x.id)!.length === 0))? undefined : [...(x.children && x.children.length > 0 ? getDepartmentWithMember(x.children,departmentMap) : []),...departmentMap.get(x.id) || []]) }); - return res}).filter(node=>node.type === 'member' ||( node.children && node.children.length > 0)) + return res})?.filter(node=>node.type === 'member' ||( node.children && node.children.length > 0)) || [] } export const addMemberToDepartment = (departmentMap: Map, departmentId: string, member: MemberItem) => {