From 662a4a46718cdc868ed5c636fd805b0221b95039 Mon Sep 17 00:00:00 2001
From: Finley Ge <32237950+FinleyGe@users.noreply.github.com>
Date: Thu, 6 Mar 2025 00:26:32 +0800
Subject: [PATCH] fix: remove defaultTeam (#3989)

---
 packages/global/support/user/team/controller.d.ts         | 1 -
 packages/global/support/user/team/type.d.ts               | 2 --
 packages/service/support/user/team/controller.ts          | 4 +---
 packages/service/support/user/team/teamMemberSchema.ts    | 8 ++++----
 .../app/src/pageComponents/account/team/MemberTable.tsx   | 2 +-
 5 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/packages/global/support/user/team/controller.d.ts b/packages/global/support/user/team/controller.d.ts
index f8c0ea2ff..cf17b7add 100644
--- a/packages/global/support/user/team/controller.d.ts
+++ b/packages/global/support/user/team/controller.d.ts
@@ -10,7 +10,6 @@ export type AuthTeamRoleProps = {
 export type CreateTeamProps = {
   name: string;
   avatar?: string;
-  defaultTeam?: boolean;
   memberName?: string;
   memberAvatar?: string;
   notificationAccount?: string;
diff --git a/packages/global/support/user/team/type.d.ts b/packages/global/support/user/team/type.d.ts
index c087046ea..3be913870 100644
--- a/packages/global/support/user/team/type.d.ts
+++ b/packages/global/support/user/team/type.d.ts
@@ -47,7 +47,6 @@ export type TeamMemberSchema = {
   role: `${TeamMemberRoleEnum}`;
   status: `${TeamMemberStatusEnum}`;
   avatar: string;
-  defaultTeam: boolean;
 };
 
 export type TeamMemberWithTeamAndUserSchema = TeamMemberSchema & {
@@ -65,7 +64,6 @@ export type TeamTmbItemType = {
   balance?: number;
   tmbId: string;
   teamDomain: string;
-  defaultTeam: boolean;
   role: `${TeamMemberRoleEnum}`;
   status: `${TeamMemberStatusEnum}`;
   notificationAccount?: string;
diff --git a/packages/service/support/user/team/controller.ts b/packages/service/support/user/team/controller.ts
index a3d6fe6d5..d4d8a3aff 100644
--- a/packages/service/support/user/team/controller.ts
+++ b/packages/service/support/user/team/controller.ts
@@ -43,7 +43,6 @@ async function getTeamMember(match: Record<string, any>): Promise<TeamTmbItemTyp
     teamDomain: tmb.team?.teamDomain,
     role: tmb.role,
     status: tmb.status,
-    defaultTeam: tmb.defaultTeam,
     permission: new TeamPermission({
       per: Per ?? TeamDefaultPermissionVal,
       isOwner: tmb.role === TeamMemberRoleEnum.owner
@@ -71,8 +70,7 @@ export async function getUserDefaultTeam({ userId }: { userId: string }) {
     return Promise.reject('tmbId or userId is required');
   }
   return getTeamMember({
-    userId: new Types.ObjectId(userId),
-    defaultTeam: true
+    userId: new Types.ObjectId(userId)
   });
 }
 
diff --git a/packages/service/support/user/team/teamMemberSchema.ts b/packages/service/support/user/team/teamMemberSchema.ts
index 26df6297c..56bdc277d 100644
--- a/packages/service/support/user/team/teamMemberSchema.ts
+++ b/packages/service/support/user/team/teamMemberSchema.ts
@@ -39,14 +39,14 @@ const TeamMemberSchema = new Schema({
   updateTime: {
     type: Date
   },
-  defaultTeam: {
-    type: Boolean,
-    default: false
-  },
 
   // Abandoned
   role: {
     type: String
+  },
+  // Abandoned
+  defaultTeam: {
+    type: Boolean
   }
 });
 
diff --git a/projects/app/src/pageComponents/account/team/MemberTable.tsx b/projects/app/src/pageComponents/account/team/MemberTable.tsx
index 4230776f8..fe9968da8 100644
--- a/projects/app/src/pageComponents/account/team/MemberTable.tsx
+++ b/projects/app/src/pageComponents/account/team/MemberTable.tsx
@@ -93,7 +93,7 @@ function MemberTable({ Tabs }: { Tabs: React.ReactNode }) {
 
   const { runAsync: onLeaveTeam } = useRequest2(
     async () => {
-      const defaultTeam = myTeams.find((item) => item.defaultTeam) || myTeams[0];
+      const defaultTeam = myTeams[0];
       // change to personal team
       onSwitchTeam(defaultTeam.teamId);
       return delLeaveTeam();