Ver Fonte

Merge branch 'dev_v1.1.45_wh' of BaseService/jyMicroservices into feature/v1.1.45

王浩 há 1 ano atrás
pai
commit
28099f2a3a
1 ficheiros alterados com 3 adições e 3 exclusões
  1. 3 3
      jyBXSubscribe/rpc/model/push.go

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

@@ -414,7 +414,7 @@ func (s *subscribePush) inactiveQuery(spqp *SubPushQueryParam, bsp *ViewConditio
 		list = elastic.Get("bidding", "bidding", fmt.Sprintf(query, strings.Join(spqp.SelectInfoIds, `","`), len(spqp.SelectInfoIds)))
 		count = gconv.Int64(len(*list))
 	} else {
-		if len(bsp.Keyword) == 0 {
+		if len(bsp.Keyword) == 0 || spqp.PageNum*spqp.PageSize > 500 {
 			return []*bxsubscribe.SubscribeInfo{}, int64(0)
 		}
 		//通过条件查询
@@ -441,8 +441,8 @@ func (s *subscribePush) inactiveQuery(spqp *SubPushQueryParam, bsp *ViewConditio
 		//list = elastic.GetAllByNgram(INDEX, TYPE, qstr, findfields, bidSort, bidField, 0, 4500, 0, false)
 		count, list = elastic.GetWithCount(INDEX, TYPE, "", qstr)
 	}
-	if count > 4500 {
-		count = 4500
+	if count > 500 {
+		count = 500
 	}
 	log.Println(count, list)
 	//数据清洗