1

services/print_server/app_server/wx_login.go

@@ -30,13 +30,10 @@ func (u *UserLogin) WxLogin(ctx *gin.Context, param *wxLogin.WxLoginReq) (*model
 	}
 
 	// 检查用户是否存在
-	users, err := dao.GetUsers(globals.GetDB(), "", "", param.Phone, openObj.OpenID)
+	users, err := dao.GetUsers(globals.GetDB(), "", "", param.Phone, "")
 	if err != nil {
 		return nil, err
 	}
-	if len(users) > 1 {
-		return nil, errors.New("数据异常，用户电话不唯一，联系管理员")
-	}
 
 	var userObj *model.User
 	timeNow := time.Now()
@@ -74,7 +71,7 @@ func (u *UserLogin) WxLogin(ctx *gin.Context, param *wxLogin.WxLoginReq) (*model
 		userObj = userBase
 	case 1:
 		// 用户使用电话号码登录，未使用微信登录
-		if users[0].OpenId == "" {
+		if users[0].OpenId == "" || users[0].OpenId != openObj.OpenID {
 			users[0].Name = param.NickName
 			users[0].Avatar = param.HeadUrl
 			users[0].OpenId = openObj.OpenID