fix

controller/auth.go

@@ -34,10 +34,11 @@ func (a *AuthController) Login(c *gin.Context) {
 		return
 	}
 
+	userEmail := new(english_report_email.Email)
 	emailItem := new(english_report_email.Email)
 	if req.Type == 1 {
-		_, err = emailItem.GetByEmail(req.Account)
-		if err != nil || emailItem.IsDeleted == 1 {
+		userEmail, err = emailItem.GetByEmail(req.Account)
+		if err != nil || userEmail.IsDeleted == 1 {
 			if err == utils.ErrNoRow {
 				resp.Unregistered("账号未注册", c)
 				return
@@ -46,8 +47,8 @@ func (a *AuthController) Login(c *gin.Context) {
 			return
 		}
 	} else {
-		_, err := emailItem.GetByMobile(req.Account, req.CountryCode)
-		if err != nil || emailItem.IsDeleted == 1 {
+		userEmail, err := emailItem.GetByMobile(req.Account, req.CountryCode)
+		if err != nil || userEmail.IsDeleted == 1 {
 			if err == utils.ErrNoRow {
 				resp.Unbound("手机号未绑定", c)
 				return
@@ -424,7 +425,7 @@ func (a *AuthController) ForgetPwd(c *gin.Context) {
 	emailItem := new(english_report_email.Email)
 	if req.Type == 1 {
 		userEmail, err = emailItem.GetByEmail(req.Account)
-		if err != nil {
+		if err != nil || userEmail.IsDeleted == 1 {
 			if err == utils.ErrNoRow {
 				resp.Unregistered("账号未注册", c)
 				return
@@ -434,7 +435,7 @@ func (a *AuthController) ForgetPwd(c *gin.Context) {
 		}
 	} else {
 		userEmail, err = emailItem.GetByMobile(req.Account, req.CountryCode)
-		if err != nil {
+		if err != nil || userEmail.IsDeleted == 1 {
 			if err == utils.ErrNoRow {
 				resp.Unbound("手机号未绑定", c)
 				return