Przeglądaj źródła

Merge branch 'feature/v1.1.64' of https://jygit.jydev.jianyu360.cn/BaseService/jyMicroservices into feature/v1.1.64

fuwencai 7 miesięcy temu
rodzic
commit
1ca466dce9
1 zmienionych plików z 2 dodań i 2 usunięć
  1. 2 2
      jyBXSubscribe/rpc/model/push.go

+ 2 - 2
jyBXSubscribe/rpc/model/push.go

@@ -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) {