|
@@ -311,8 +311,6 @@ func (s *subscribePush) Datas(spqp *SubPushQueryParam) (hasNextPage bool, total
|
|
logx.Info("a4")
|
|
logx.Info("a4")
|
|
result, total = s.getDatasFromMysql(spqp, starttime, endtime, spqp.PageSize, true)
|
|
result, total = s.getDatasFromMysql(spqp, starttime, endtime, spqp.PageSize, true)
|
|
}
|
|
}
|
|
- logx.Info("-------------------------------------------------", len(result))
|
|
|
|
- log.Println(spqp.IsEmpty() && (spqp.PageNum-1)*spqp.PageSize <= 250)
|
|
|
|
if result == nil {
|
|
if result == nil {
|
|
result = []*bxsubscribe.SubscribeInfo{}
|
|
result = []*bxsubscribe.SubscribeInfo{}
|
|
}
|
|
}
|
|
@@ -338,7 +336,7 @@ func (s *subscribePush) getDatasFromMysql(spqp *SubPushQueryParam, starttime, en
|
|
} else {
|
|
} else {
|
|
if spqp.IsEnt {
|
|
if spqp.IsEnt {
|
|
if spqp.BuySubject == 1 {
|
|
if spqp.BuySubject == 1 {
|
|
- userStr = fmt.Sprintf(" a.entid='%s' and (a.source =2 or a.source =1) ", spqp.EntId)
|
|
|
|
|
|
+ userStr = fmt.Sprintf(" a.entid='%s' and (a.source =2 or a.source =3) ", spqp.EntId)
|
|
} else {
|
|
} else {
|
|
userStr = fmt.Sprintf(" a.entid='%s' ", spqp.EntId)
|
|
userStr = fmt.Sprintf(" a.entid='%s' ", spqp.EntId)
|
|
}
|
|
}
|