|
|
@@ -284,7 +284,7 @@ func NewMyUserInfo(Mgo *MongodbSim, msl *Mysql, userId string) *UserInfo {
|
|
|
}
|
|
|
|
|
|
//
|
|
|
-func NewMyUserInfoByEntUserId(Mgo *MongodbSim, Mysql *Mysql, userId string) *UserInfo {
|
|
|
+func NewMyUserInfoByEntUserId(Mgo *MongodbSim, Mysql *Mysql, userId string) (*UserInfo, map[string]interface{}) {
|
|
|
var user *map[string]interface{}
|
|
|
if IsObjectIdHex(userId) {
|
|
|
user, _ = Mgo.FindById(Mgo_User, userId, UserCollFields)
|
|
|
@@ -297,7 +297,7 @@ func NewMyUserInfoByEntUserId(Mgo *MongodbSim, Mysql *Mysql, userId string) *Use
|
|
|
}
|
|
|
ui := NewUserInfo(*user, 0)
|
|
|
ui.Id = userId
|
|
|
- return ui
|
|
|
+ return ui, *user
|
|
|
}
|
|
|
|
|
|
// 解析用户的推送设置
|
