Merge remote-tracking branch 'origin/user_login' into user_permission

controllers/user.go

@@ -329,12 +329,12 @@ func (this *UserNotAuthController) Login() {
 		return
 	}
 	user, err = services.BindWxUser(openId, req.Mobile, req.Email, 1)
-	userId := user.UserId
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		br.Msg = "登录失败，系统处理中，请稍后重试"
 		br.ErrMsg = "登录失败:" + err.Error()
 		return
 	}
+	userId := user.UserId
 
 	var token string
 	tokenItem, err := models.GetTokenByOpenId(openId)