Merge branch 'dev/v1.1.29_fuwencai' of BaseService/jyMicroservices into feature/v1.1.29

jyBXCore/rpc/entity/search.go

@@ -210,6 +210,11 @@ func (kws *KeyWordsSearch) SearchParamsHandle(in *bxcore.SearchReq) []string {
 	if in.PageNum <= 0 {
 		in.PageNum = 1
 	}
+	count := MC.If(in.IsPay, IC.C.DefaultBidInfo.PayCount, IC.C.DefaultBidInfo.Count).(int64)
+	if in.PageNum > count/in.PageSize {
+		in.PageNum = -1
+		in.PageSize = -1
+	}
 	//行业格式化
 	if in.Industry != "" {
 		in.Industry = strings.TrimSpace(in.Industry)

jyBXCore/rpc/internal/logic/getsearchlistlogic.go

@@ -43,6 +43,13 @@ func (l *GetSearchListLogic) GetSearchList(in *bxcore.SearchReq) (*bxcore.Search
 	ks := entity.NewKeyWordsSearch()
 	//处理搜索条件
 	heightWords := ks.SearchParamsHandle(in)
+	if in.PageNum < 0 && in.PageSize < 0 {
+		return &bxcore.SearchResp{
+			Data:    res,
+			ErrMsg:  "",
+			ErrCode: 0,
+		}, nil
+	}
 	//判断是否是空搜索，如果是空搜索，查缓存数据
 	if ks.IsEmptySearch(in) {
 		res.List, res.Count, res.Total = ks.GetBidSearchListByCache(in)