- nil compare
This commit is contained in:
@@ -30,7 +30,10 @@ type UserProvider struct {
|
||||
func (*UserProvider) GetUser(authID, authIDType string) (user auth2.IUser) {
|
||||
fieldName := authTypeFieldMap[authIDType]
|
||||
if fieldName != "" {
|
||||
user, _ = dao.GetUserByID(dao.GetDB(), fieldName, authID)
|
||||
user2, err := dao.GetUserByID(dao.GetDB(), fieldName, authID)
|
||||
if err == nil {
|
||||
user = user2 // 这样写的原因是golang nil的比较问题
|
||||
}
|
||||
}
|
||||
return user
|
||||
}
|
||||
|
||||
@@ -13,9 +13,7 @@ func GetUserByID(db *DaoDB, fieldName, fieldValue string) (user *model.User, err
|
||||
FROM user t1
|
||||
WHERE t1.deleted_at = ? AND t1.%s = ?
|
||||
`, fieldName)
|
||||
if err = GetRow(db, &user, sql, utils.DefaultTimeValue, fieldValue); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
err = GetRow(db, &user, sql, utils.DefaultTimeValue, fieldValue)
|
||||
return user, err
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user