|
@@ -417,7 +417,7 @@ func getDataByAppid(appid string, i_day, next, i_all, findType, reload, reqtype
|
|
fields["_id"] = 1
|
|
fields["_id"] = 1
|
|
// data, bdata := Mgo.Find("usermail", query, `{"_id":1}`, fields, false, i_next, QUERY_LIMIT)
|
|
// data, bdata := Mgo.Find("usermail", query, `{"_id":1}`, fields, false, i_next, QUERY_LIMIT)
|
|
// data, bdata := Mgo.Find("usermail", query, nil, nil, false, i_next, QUERY_LIMIT)
|
|
// data, bdata := Mgo.Find("usermail", query, nil, nil, false, i_next, QUERY_LIMIT)
|
|
- data, bdata := getUserMailData(query, appid, i_next, findType)
|
|
|
|
|
|
+ data, bdata := getUserMailData(query, appid, i_next, findType, blastid)
|
|
if bdata && data != nil && *data != nil && len(*data) > 0 {
|
|
if bdata && data != nil && *data != nil && len(*data) > 0 {
|
|
log.Println("bdatalen ", len(*data))
|
|
log.Println("bdatalen ", len(*data))
|
|
for _, n := range *data {
|
|
for _, n := range *data {
|
|
@@ -798,12 +798,16 @@ func getDataByAppid(appid string, i_day, next, i_all, findType, reload, reqtype
|
|
return
|
|
return
|
|
}
|
|
}
|
|
|
|
|
|
-func getUserMailData(query map[string]interface{}, appid string, i_next, findType int) (data *[]map[string]interface{}, bdata bool) {
|
|
|
|
|
|
+func getUserMailData(query map[string]interface{}, appid string, i_next, findType int, isSort bool) (data *[]map[string]interface{}, bdata bool) {
|
|
if findType == 1 {
|
|
if findType == 1 {
|
|
query["ispanchong"] = 1
|
|
query["ispanchong"] = 1
|
|
data, bdata = Mgo.Find("usermail", query, nil, nil, false, i_next, QUERY_LIMIT)
|
|
data, bdata = Mgo.Find("usermail", query, nil, nil, false, i_next, QUERY_LIMIT)
|
|
} else {
|
|
} else {
|
|
- data, bdata = Mgo.Find("usermail", query, nil, nil, false, i_next, QUERY_LIMIT)
|
|
|
|
|
|
+ if isSort {
|
|
|
|
+ data, bdata = Mgo.Find("usermail", query, `{"_id":1}`, nil, false, i_next, QUERY_LIMIT)
|
|
|
|
+ } else {
|
|
|
|
+ data, bdata = Mgo.Find("usermail", query, nil, nil, false, i_next, QUERY_LIMIT)
|
|
|
|
+ }
|
|
}
|
|
}
|
|
return data, bdata
|
|
return data, bdata
|
|
}
|
|
}
|