|
|
@@ -333,11 +333,16 @@ func GetLoginAccountByLoginCode(loginCode string) (*Loginaccount, error) {
|
|
|
var loginaccount *Loginaccount
|
|
|
loginaccount = &Loginaccount{}
|
|
|
// var loginaccount Loginaccount
|
|
|
- if _, err := engine.Where("LOGINCODE = ?", loginCode).Get(loginaccount); err != nil {
|
|
|
+ has, err := engine.Where("LOGINCODE = ?", loginCode).Get(loginaccount)
|
|
|
+ if err != nil {
|
|
|
return nil, err
|
|
|
}
|
|
|
|
|
|
- return loginaccount, nil
|
|
|
+ if has {
|
|
|
+ return loginaccount, nil
|
|
|
+ }
|
|
|
+
|
|
|
+ return nil, nil
|
|
|
}
|
|
|
|
|
|
// GetLoginAccountByMobile 通过手机号码查询登录账号信息
|
|
|
@@ -345,17 +350,23 @@ func GetLoginAccountByMobile(mobile string) (*Loginaccount, error) {
|
|
|
engine := db.GetEngine()
|
|
|
|
|
|
var loginaccount *Loginaccount
|
|
|
+ var has bool
|
|
|
// 手机号码需要AES加密
|
|
|
key, _ := hex.DecodeString(utils.AESSecretKey)
|
|
|
if mobileEncrypted, err := utils.AESEncrypt([]byte(mobile), key); err == nil {
|
|
|
// 加密成功后进行查询
|
|
|
- if _, err := engine.Join("INNER", "USERINFO", "USERINFO.USERID = LOGINACCOUNT.USERID").
|
|
|
- Where("USERINFO.MOBILE = ?", hex.EncodeToString(mobileEncrypted)).Get(loginaccount); err != nil {
|
|
|
+ has, err = engine.Join("INNER", "USERINFO", "USERINFO.USERID = LOGINACCOUNT.USERID").
|
|
|
+ Where("USERINFO.MOBILE = ?", hex.EncodeToString(mobileEncrypted)).Get(loginaccount)
|
|
|
+ if err != nil {
|
|
|
return nil, err
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- return loginaccount, nil
|
|
|
+ if has {
|
|
|
+ return loginaccount, nil
|
|
|
+ }
|
|
|
+
|
|
|
+ return nil, nil
|
|
|
}
|
|
|
|
|
|
// GetUserAccount 获取用户账户信息
|