From d52ceb5e83c941e3963d32d004f569819ef5aeeb Mon Sep 17 00:00:00 2001
From: CounterFire2023 <136581895+CounterFire2023@users.noreply.github.com>
Date: Wed, 15 May 2024 20:12:32 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=91=E5=AE=9A=E6=B8=B8=E6=88=8F=E5=B8=90?=
 =?UTF-8?q?=E5=8F=B7=E6=97=B6,=20=E5=A2=9E=E5=8A=A0=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/controllers/mail.controller.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/controllers/mail.controller.ts b/src/controllers/mail.controller.ts
index 8edb5af..45f09ac 100644
--- a/src/controllers/mail.controller.ts
+++ b/src/controllers/mail.controller.ts
@@ -82,7 +82,13 @@ class MailController extends BaseController {
     }
     const openId = recordCode.openId
     let userCheck = await ActivityUser.findOne({ clientId: openId, clientPlat: recordCode.plat })
-    if (userCheck && userCheck.id !== user.id) {
+    let userCheck2 = await ActivityUser.findOne({ googleId: openId })
+    let userCheck3 = await ActivityUser.findOne({ emailId: openId })
+    if (
+      (userCheck && userCheck.id !== user.id) ||
+      (userCheck2 && userCheck2.id !== user.id) ||
+      (userCheck3 && userCheck3.id !== user.id)
+    ) {
       throw new ZError(13, 'Email already binded to another account')
     }
     user.clientId = openId