Merge remote-tracking branch 'origin/dev' into dev

queries/admin/user.ts

@@ -198,9 +198,16 @@ export async function deleteUser(
       }),
       client.teamUser.deleteMany({
         where: {
-          teamId: {
+          OR: [
-            in: teamIds,
+            {
-          },
+              teamId: {
+                in: teamIds,
+              },
+            },
+            {
+              userId,
+            },
+          ],
         },
       }),
       client.team.deleteMany({