Merge branch 'master' of http://8.136.199.33:3000/hongze/hongze_cygxzs into debug

controllers/wechat.go

@@ -36,7 +36,6 @@ func (this *WechatCommonController) WechatLoginByxzs() {
 		br.ErrMsg = "Code 为空"
 		return
 	}
-	return
 	var token string
 	item, err := services.WxGetUserOpenIdByCodeXzs(code)
 	if err != nil {
@@ -120,11 +119,13 @@ func (this *WechatCommonController) WechatLoginByxzs() {
 			return
 		}
 	} else {
-		err = models.UpdateCygxUserRecordMobileByOpenId(user.UserId, user.Mobile, openId)
-		if err != nil {
-			br.Msg = "获取用户信息失败"
-			br.ErrMsg = "更新openid绑定关系失败，Err:" + err.Error()
-			return
+		if user != nil {
+			err = models.UpdateCygxUserRecordMobileByOpenId(user.UserId, user.Mobile, openId)
+			if err != nil {
+				br.Msg = "获取用户信息失败"
+				br.ErrMsg = "更新openid绑定关系失败，Err:" + err.Error()
+				return
+			}
 		}
 	}
 	timeUnix := time.Now().Unix()