Browse Source

fix:登录用户逻辑调整,如果有关联其他平台的unionId,那么就直接绑定该unionId的user_id

Roc 3 years ago
parent
commit
4c95c48233
2 changed files with 3 additions and 3 deletions
  1. 2 2
      models/tables/user_record/query.go
  2. 1 1
      services/user/user.go

+ 2 - 2
models/tables/user_record/query.go

@@ -26,8 +26,8 @@ func GetUserThirdRecordByUserId(userId int) (item *UserRecord, err error) {
 	return
 }
 
-// GetFirstByUnionID 根据用户UnionID获取最小平台的用户关系
+// GetFirstByUnionID 根据用户UnionID获取最小平台的用户关系(已经绑定了user_id的)
 func GetFirstByUnionID(unionID string) (item *UserRecord, err error) {
-	err = global.DEFAULT_MYSQL.Where("union_id = ? ", unionID).Order("create_platform asc").First(&item).Error
+	err = global.DEFAULT_MYSQL.Where("union_id = ? and user_id>0", unionID).Order("create_platform asc").First(&item).Error
 	return
 }

+ 1 - 1
services/user/user.go

@@ -170,7 +170,7 @@ func GetWxUserItemByUnionId(unionId string, platform int) (userInfo UserInfo, er
 	return
 }
 
-// GetFirstWxUserItemByUnionId 根据用户unionid获取最小平台的用户信息
+// GetFirstWxUserItemByUnionId 根据用户unionid获取最小平台的用户信息(已经绑定了user_id的)
 func GetFirstWxUserItemByUnionId(unionId string) (userInfo UserInfo, err error) {
 	// 获取用户信息
 	userRecord, userRecordErr := user_record.GetFirstByUnionID(unionId)