|
|
@@ -604,8 +604,14 @@ func getEntPushSet(mgo *MongodbSim, msl *Mysql, entUserId int, phone string) *ma
|
|
|
if user["_id"] == nil {
|
|
|
user["_id"] = v["_id"]
|
|
|
user["base_user_id"] = v["base_user_id"]
|
|
|
+ }
|
|
|
+ if user["s_phone"] == nil && util.ObjToString(v["s_phone"]) != "" {
|
|
|
user["s_phone"] = v["s_phone"]
|
|
|
+ }
|
|
|
+ if user["s_m_phone"] == nil && util.ObjToString(v["s_m_phone"]) != "" {
|
|
|
user["s_m_phone"] = v["s_m_phone"]
|
|
|
+ }
|
|
|
+ if user["a_m_openid"] == nil && util.ObjToString(v["a_m_openid"]) != "" {
|
|
|
user["a_m_openid"] = v["a_m_openid"]
|
|
|
}
|
|
|
s_m_openid := util.ObjToString(v["s_m_openid"])
|
|
|
@@ -616,7 +622,6 @@ func getEntPushSet(mgo *MongodbSim, msl *Mysql, entUserId int, phone string) *ma
|
|
|
if user["s_m_openid"] == nil && user["i_ispush"] == nil && s_m_openid != "" && i_ispush == 1 {
|
|
|
user["s_m_openid"] = s_m_openid
|
|
|
user["i_ispush"] = i_ispush
|
|
|
- user["i_applystatus"] = v["i_applystatus"]
|
|
|
}
|
|
|
if user["s_jpushid"] == nil && user["s_opushid"] == nil && user["s_appponetype"] == nil && s_appponetype != "" && (s_jpushid != "" || s_opushid != "") {
|
|
|
user["s_jpushid"] = s_jpushid
|
