增加字段

p/public.go

@@ -584,13 +584,16 @@ func getEntPushSet(mgo *MongodbSim, msl *Mysql, entUserId int, phone string) *ma
 			},
 		},
 	}, `{"s_phone":-1}`, map[string]interface{}{
-		"_id":           0,
+		"_id":           1,
 		"s_m_openid":    1,
+		"a_m_openid":    1,
+		"s_phone":       1,
+		"s_m_phone":     1,
 		"i_ispush":      1,
 		"s_jpushid":     1,
 		"s_opushid":     1,
 		"s_appponetype": 1,
-		"i_applystatus": 1,
+		"base_user_id":  1,
 	}, false, -1, -1)
 	if !ok || users == nil || len(*users) == 0 {
 		logger.Info("user表中没有找到该企业用户", entUserId, phone)
@@ -598,6 +601,13 @@ func getEntPushSet(mgo *MongodbSim, msl *Mysql, entUserId int, phone string) *ma
 	}
 	user := map[string]interface{}{}
 	for _, v := range *users {
+		if user["_id"] == nil {
+			user["_id"] = v["_id"]
+			user["base_user_id"] = v["base_user_id"]
+			user["s_phone"] = v["s_phone"]
+			user["s_m_phone"] = v["s_m_phone"]
+			user["a_m_openid"] = v["a_m_openid"]
+		}
 		s_m_openid := util.ObjToString(v["s_m_openid"])
 		i_ispush := util.IntAll(v["i_ispush"])
 		s_jpushid := util.ObjToString(v["s_jpushid"])
@@ -616,7 +626,7 @@ func getEntPushSet(mgo *MongodbSim, msl *Mysql, entUserId int, phone string) *ma
 	}
 	entniche_user, ok := mgo.FindOneByField(Mgo_Ent_User, map[string]interface{}{
 		"i_userid": entUserId,
-	}, `{"_id":0,"i_member_status":1,"i_vip_status":1,"o_follow_project":1,"o_follow_ent":1}`)
+	}, `{"_id":0,"i_member_status":1,"i_vip_status":1,"o_pushset":1}`)
 	if ok && entniche_user != nil && len(*entniche_user) > 0 {
 		for k, v := range *entniche_user {
 			user[k] = v