fix

controller/auth.go

@@ -36,25 +36,26 @@ func (a *AuthController) Login(c *gin.Context) {
 
 	emailItem := new(english_report_email.Email)
 	if req.Type == 1 {
-		userEmail, err := emailItem.GetByEmail(req.Account)
-		if err != nil && err != utils.ErrNoRow {
+		_, err = emailItem.GetByEmail(req.Account)
+		if err != nil {
+			if err == utils.ErrNoRow {
+				resp.Unregistered("账号未注册", c)
+				return
+			}
 			resp.Unregistered("账号未注册.", c)
 			return
 		}
-		if userEmail == nil {
-			resp.Unregistered("账号未注册", c)
-			return
-		}
+
 	} else {
-		userEmail, err := emailItem.GetByMobile(req.Account, req.CountryCode)
-		if err != nil && err != utils.ErrNoRow {
+		_, err := emailItem.GetByMobile(req.Account, req.CountryCode)
+		if err != nil {
+			if err == utils.ErrNoRow {
+				resp.Unbound("手机号未绑定", c)
+				return
+			}
 			resp.FailData("获取客户邮箱信息失败 ", "Err:"+err.Error(), c)
 			return
 		}
-		if userEmail == nil {
-			resp.Unbound("手机号未绑定", c)
-			return
-		}
 	}
 
 	sysUser, err := english_report_email.CheckUserPwd(req.Type, req.CountryCode, req.Account, req.Password)
@@ -354,11 +355,12 @@ func (a *AuthController) BindMobile(c *gin.Context) {
 
 	emailItem := new(english_report_email.Email)
 	userEmail, err := emailItem.GetByMobile(req.Mobile, req.CountryCode)
-	if err != nil && err != utils.ErrNoRow {
-		resp.FailData("获取客户邮箱信息失败 ", "Err:"+err.Error(), c)
-		return
+	if err != nil && err == utils.ErrNoRow {
+			resp.FailData("获取客户邮箱信息失败 ", "Err:"+err.Error(), c)
+			return
 	}
-	if userEmail != nil {
+
+	if userEmail.Id != 0 {
 		resp.Bound("手机号已绑定 ", c)
 		return
 	}
@@ -425,25 +427,25 @@ 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 && err != utils.ErrNoRow {
+		_, err = emailItem.GetByEmail(req.Account)
+		if err != nil {
+			if err == utils.ErrNoRow {
+				resp.Unregistered("账号未注册", c)
+				return
+			}
 			resp.FailData("获取客户邮箱信息失败 ", "Err:"+err.Error(), c)
 			return
 		}
-		if userEmail == nil {
-			resp.Unregistered("账号未注册", c)
-			return
-		}
 	} else {
-		userEmail, err := emailItem.GetByMobile(req.Account, req.CountryCode)
-		if err != nil && err != utils.ErrNoRow {
+		_, err = emailItem.GetByMobile(req.Account, req.CountryCode)
+		if err != nil {
+			if err == utils.ErrNoRow {
+				resp.Unbound("手机号未绑定", c)
+				return
+			}
 			resp.FailData("获取客户邮箱信息失败 ", "Err:"+err.Error(), c)
 			return
 		}
-		if userEmail == nil {
-			resp.Unbound("手机号未绑定", c)
-			return
-		}
 	}
 
 	item, err := msg_code.GetMsgCode(req.Account, req.SmsCode)