From 64fdf59905fb4aff9c17ffbba42df0923f9bdeb1 Mon Sep 17 00:00:00 2001
From: maggieyyy <61950669+maggieyyy@users.noreply.github.com>
Date: Fri, 1 Nov 2024 13:54:33 +0800
Subject: [PATCH 1/3] fix: Add empty to member transfer

---
 .../common/src/components/aoplatform/MemberTransfer.tsx  | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/frontend/packages/common/src/components/aoplatform/MemberTransfer.tsx b/frontend/packages/common/src/components/aoplatform/MemberTransfer.tsx
index d7972d94..ac3b513d 100644
--- a/frontend/packages/common/src/components/aoplatform/MemberTransfer.tsx
+++ b/frontend/packages/common/src/components/aoplatform/MemberTransfer.tsx
@@ -1,5 +1,5 @@
 
-import { TransferProps, TreeDataNode, Tree, Spin, Input } from "antd";
+import { TransferProps, TreeDataNode, Tree, Spin, Input, Empty } from "antd";
 import { DataNode } from "antd/es/tree";
 import {  Ref, forwardRef, useEffect, useImperativeHandle, useMemo, useRef, useState } from "react";
 import { ApartmentOutlined, LoadingOutlined, UserOutlined } from "@ant-design/icons";
@@ -149,10 +149,9 @@ const generateTree = (
     return (
         <div ref={parentRef}>
         <Spin indicator={<LoadingOutlined style={{ fontSize: 24 }} spin />} spinning={loading} className=''>
-          <Input  placeholder={searchPlaceholder} onChange={(e)=>setSearchWord(e.target.value)} value={searchWord} />
-          <Tree
+          <Input className="mb-[10px]" placeholder={searchPlaceholder} onChange={(e)=>setSearchWord(e.target.value)} value={searchWord} />
+         <>{ translatedDataSource && translatedDataSource.length > 0 ? <Tree
             checkable
-            className="mt-[10px]"
             expandedKeys={expandedKeys}
             checkedKeys={targetKeys}
             selectable={false}
@@ -163,7 +162,7 @@ const generateTree = (
             blockNode 
             showIcon
           />
-
+            :  <Empty image={Empty.PRESENTED_IMAGE_SIMPLE}/> }</> 
             </Spin>
         </div>
       );

From 83e3cc85f20dbf93022ca14cfb67f528d9f8ecce 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 2/3] 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<BasicResponse<null>>(`team/member/role`, {method: 'PUT',eoBody:({roles:value, users:[entity.user.id]}), eoParams: {team:teamId}}).then(response => {
                 const {code, msg} = response

From 46143c3fe0382a76fc344f724f01d4cbb3632888 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 3/3] 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<string, (MemberItem & {type:'department'|'member'})[]>) : (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<string, (MemberItem & {type:'department'|'member'})[]>, departmentId: string, member: MemberItem) => {