From 0e87a7d13548190dcbe68d0360fc98bf92d916c3 Mon Sep 17 00:00:00 2001
From: ychao_1983 <ychao_1983@sina.com>
Date: Tue, 24 Aug 2021 10:56:33 +0800
Subject: [PATCH] =?UTF-8?q?#282=E4=BC=98=E5=8C=96=EF=BC=8C=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E4=B8=BB=E9=82=AE=E7=AE=B1=E6=97=B6=E6=A3=80=E6=9F=A5?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E8=A2=AB=E5=88=AB=E7=9A=84=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E4=BA=86=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 models/user_mail.go | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/models/user_mail.go b/models/user_mail.go
index 7244ec378..8bf74b81b 100755
--- a/models/user_mail.go
+++ b/models/user_mail.go
@@ -293,6 +293,16 @@ func MakeEmailPrimary(email *EmailAddress) error {
 	}
 
 	user.Email = email.Email
+
+	has, err = sess.Where("id!=?", user.ID).
+		And("type=?", user.Type).
+		And("email=?", strings.ToLower(user.Email)).
+		Get(new(User))
+	if err != nil {
+		return err
+	} else if has {
+		return ErrEmailAlreadyUsed{user.Email}
+	}
 	if _, err = sess.ID(user.ID).Cols("email").Update(user); err != nil {
 		return err
 	}