|
|
@@ -305,7 +305,7 @@ func (s *subscribePush) Datas(spqp *SubPushQueryParam) (hasNextPage bool, total
|
|
|
start := (spqp.PageNum - 1) * spqp.PageSize
|
|
|
end := start + spqp.PageSize
|
|
|
//时间是今天，没有别的过滤条件--首先读取当前推送缓存数据 其次查询数据库
|
|
|
- if nowFormat == date.FormatDateByInt64(&starttime, date.Date_Short_Layout) && spqp.Area == "" && spqp.City == "" && spqp.Buyerclass == "" && spqp.Subscopeclass == "" && spqp.Subtype == "" && spqp.Key == "" && spqp.Price == "" && spqp.FileExists == "" && len(spqp.Staffs) == 0 && spqp.Source == "" && spqp.IsRead == "" {
|
|
|
+ if nowFormat == date.FormatDateByInt64(&starttime, date.Date_Short_Layout) && spqp.Area == "" && spqp.City == "" && spqp.Buyerclass == "" && spqp.Subscopeclass == "" && spqp.Subtype == "" && spqp.Key == "" && spqp.Price == "" && spqp.FileExists == "" && len(spqp.Staffs) == 0 && spqp.Source == "" && spqp.IsRead == "" && len(spqp.SelectInfoIds) == 0 {
|
|
|
subPush := &SubPush{}
|
|
|
var err error
|
|
|
if spqp.IsEnt == false {
|
|
|
@@ -1543,7 +1543,7 @@ func (s *subscribePush) Keys(spqp *KeyParam) (result []*bxsubscribe.KeyItems) {
|
|
|
res_, _ := IC.Mgo.FindOneByField("entniche_rule", map[string]interface{}{
|
|
|
"i_userid": common.Int64All(spqp.EntUserId),
|
|
|
"i_entid": common.Int64All(spqp.EntId),
|
|
|
- "type": types,
|
|
|
+ "i_type": types,
|
|
|
}, `{"o_entniche":1}`)
|
|
|
if res_ != nil {
|
|
|
o_entniche = common.ObjToMap((*res_)["o_entniche"])
|
|
|
@@ -1576,6 +1576,7 @@ func (s *subscribePush) Keys(spqp *KeyParam) (result []*bxsubscribe.KeyItems) {
|
|
|
res_, _ := IC.Mgo.FindOneByField("entniche_rule", map[string]interface{}{
|
|
|
"i_userid": common.Int64All(spqp.EntUserId),
|
|
|
"i_entid": common.Int64All(spqp.EntId),
|
|
|
+ "i_type": types,
|
|
|
}, `{"o_entniche":1}`)
|
|
|
o_entniche := &map[string]interface{}{}
|
|
|
if res_ != nil {
|
