diff --git a/business/jxstore/cms/user2.go b/business/jxstore/cms/user2.go index 8b894ba76..b80dad3ec 100644 --- a/business/jxstore/cms/user2.go +++ b/business/jxstore/cms/user2.go @@ -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 } diff --git a/business/model/dao/dao_user2.go b/business/model/dao/dao_user2.go index a1bf92cfb..c2b46b6a8 100644 --- a/business/model/dao/dao_user2.go +++ b/business/model/dao/dao_user2.go @@ -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 }