|
@@ -363,7 +363,7 @@ func (s *subscribePush) Datas(spqp *SubPushQueryParam, bsp *ViewCondition) (hasN
|
|
|
spqp.PageSize = 500
|
|
|
}
|
|
|
result, total = s.inactiveQuery(spqp, bsp)
|
|
|
- hasNextPage = len(result) >= spqp.PageSize
|
|
|
+ hasNextPage = len(result) > spqp.PageSize
|
|
|
if total > 0 {
|
|
|
tipBool = true
|
|
|
}
|
|
@@ -478,7 +478,7 @@ func (s *subscribePush) Datas(spqp *SubPushQueryParam, bsp *ViewCondition) (hasN
|
|
|
result = []*bxsubscribe.SubscribeInfo{}
|
|
|
}
|
|
|
|
|
|
- hasNextPage = len(result) >= spqp.PageSize
|
|
|
+ hasNextPage = total > int64(end)
|
|
|
return
|
|
|
}
|
|
|
func (s *subscribePush) inactiveQuery(spqp *SubPushQueryParam, bsp *ViewCondition) ([]*bxsubscribe.SubscribeInfo, int64) {
|