liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- nil compare

Browse Source
This commit is contained in:
gazebo
2019-03-04 18:10:19 +08:00
parent 97b23b2a09
commit 4e13b0a42d
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
business/jxstore/cms/user2.go
View File

@@ -30,7 +30,10 @@ type UserProvider struct {
func (*UserProvider) GetUser(authID, authIDType string) (user auth2.IUser) { func (*UserProvider) GetUser(authID, authIDType string) (user auth2.IUser) {
fieldName := authTypeFieldMap[authIDType] fieldName := authTypeFieldMap[authIDType]
if fieldName != "" { 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 return user
} }

4
business/model/dao/dao_user2.go
View File

@@ -13,9 +13,7 @@ func GetUserByID(db *DaoDB, fieldName, fieldValue string) (user *model.User, err
FROM user t1 FROM user t1
WHERE t1.deleted_at = ? AND t1.%s = ? WHERE t1.deleted_at = ? AND t1.%s = ?
`, fieldName) `, fieldName)
if err = GetRow(db, &user, sql, utils.DefaultTimeValue, fieldValue); err != nil { err = GetRow(db, &user, sql, utils.DefaultTimeValue, fieldValue)
return nil, err
}
return user, err return user, err
} }