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

2023-07-01 22:03:01 -07:00
parent 9d7862cbd6 f8ededb31e
commit 7c467db27e
1 changed files with 10 additions and 3 deletions
--- a/queries/admin/user.ts
+++ b/queries/admin/user.ts
@@ -198,9 +198,16 @@ export async function deleteUser(
      }),
      client.teamUser.deleteMany({
        where: {
-          teamId: {
-            in: teamIds,
-          },
+          OR: [
+            {
+              teamId: {
+                in: teamIds,
+              },
+            },
+            {
+              userId,
+            },
+          ],
        },
      }),
      client.team.deleteMany({