kobe6258 5 сар өмнө
parent
commit
1ef7a6ecc0

+ 1 - 1
domian/report/report_service.go

@@ -1111,7 +1111,7 @@ func matchRangeByDocId(key string, from int, to int, max int64, sorts []string,
 }
 func matchRangeWithDocIds(key string, from int, to int, sorts []string, docIds []string) (request *es.ESQueryRequest) {
 	req := new(es.ESQueryRequest)
-	return req.CreateESQueryRequest(htConfig.GetReportIndex(), ESColumn, key, from, to, sorts, es.RangeByConditionWithDocIds).ByCondition("status", "PUBLISH").WithDocs(docIds)
+	return req.CreateESQueryRequest(htConfig.GetReportIndex(), ESColumn, key, from, to, sorts, es.RangeByConditionWithDocIdsNoLimit).ByCondition("status", "PUBLISH").WithDocs(docIds)
 }
 
 func CountByDocId(key string, sorts []string, docIds []string) (request *es.ESQueryRequest) {

+ 1 - 1
service/report/report_service.go

@@ -229,7 +229,7 @@ func SearchReportBookMark(key string, Ids []int, pageInfo page.PageInfo, isLogin
 	}
 	offset := page.StartIndex(pageInfo.Current, pageInfo.PageSize)
 	var reports []reportService.ReportDTO
-	reports, err = reportService.SearchReportList(key, Ids, offset, pageInfo.PageSize, pageInfo.LatestId)
+	reports, err = reportService.SearchReportList(key, Ids, offset, pageInfo.PageSize, -1)
 	list, err = dealReportInfo(reports, isLogin, userId, mappingRiskLevel, userRiskStatus)
 	if err != nil {
 		err = exception.New(exception.SearchReportPageFailed)