From 445b1277e904a9fe8a94668edbed437a95f4febc Mon Sep 17 00:00:00 2001 From: maggieyyy <61950669+maggieyyy@users.noreply.github.com> Date: Fri, 1 Nov 2024 14:21:04 +0800 Subject: [PATCH] fix: Modify department children type --- frontend/packages/core/src/pages/team/TeamInsideMember.tsx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/frontend/packages/core/src/pages/team/TeamInsideMember.tsx b/frontend/packages/core/src/pages/team/TeamInsideMember.tsx index dedf4f37..7e1dfe4a 100644 --- a/frontend/packages/core/src/pages/team/TeamInsideMember.tsx +++ b/frontend/packages/core/src/pages/team/TeamInsideMember.tsx @@ -84,6 +84,7 @@ const TeamInsideMember:FC = ()=>{ addMemberToDepartment(departmentMap, '_withoutDepartment', member); } }); + const finalData = departmentResponse.data.department ? [ @@ -93,7 +94,7 @@ const TeamInsideMember:FC = ()=>{ name: departmentResponse.data.department.name, title:departmentResponse.data.department.name, children: [ - ...getDepartmentWithMember(departmentResponse.data.department.children, departmentMap), + ...getDepartmentWithMember(departmentResponse.data.department?.children || [], departmentMap), ...departmentMap.get('_withoutDepartment') || [] ] } @@ -116,7 +117,6 @@ const TeamInsideMember:FC = ()=>{ setAllMemberSelectedDepartIds((pre)=>[...pre, topDepartmentId]) } - return {data:finalData, success: true} }).catch(()=>({data:[], success:false})) } @@ -218,7 +218,6 @@ const TeamInsideMember:FC = ()=>{ const changeMemberInfo = (value:string[],entity:TeamMemberTableListItem )=>{ - //console.log(value) return new Promise((resolve, reject) => { fetchData>(`team/member/role`, {method: 'PUT',eoBody:({roles:value, users:[entity.user.id]}), eoParams: {team:teamId}}).then(response => { const {code, msg} = response