Merge branch 'cygx_6.0' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/search.go

@@ -403,7 +403,7 @@ func (this *SearchController) ListHomeArtAndChart() {
 		orderColumn = "Matching"
 	}
 	indexName := utils.IndexName
-
+	pageSize = 20
 	var chartTotal int
 	resp := new(models.SearchResp)
 	//page := paging.GetPaging(currentIndex, pageSize, total)
@@ -412,6 +412,9 @@ func (this *SearchController) ListHomeArtAndChart() {
 	var condition string
 	var pars []interface{}
 	if listType == 1 || listType == 3 {
+		if listType == 1 {
+			pageSize = 100
+		}
 		if currentIndex <= 2 {
 			condition = ` AND title LIKE '%` + keyWord + `%'`
 			chartList, err = models.GetChartList(condition, pars, startSize, pageSize)
@@ -440,12 +443,12 @@ func (this *SearchController) ListHomeArtAndChart() {
 	var total int64
 	if listType == 1 || listType == 2 {
 		if orderColumn == "PublishDate" {
-			tmpResult, tmpTotal, tmpErr := services.EsMultiMatchFunctionScoreQueryTimeSortPage(indexName, keyWord, startSize, pageSize, user.UserId)
+			tmpResult, tmpTotal, tmpErr := services.EsMultiMatchFunctionScoreQueryTimeSort(indexName, keyWord, startSize, 100, user.UserId)
 			result = tmpResult
 			total = tmpTotal
 			err = tmpErr
 		} else {
-			tmpResult, tmpTotal, tmpErr := services.EsMultiMatchFunctionScoreQuerySortPage(indexName, keyWord, startSize, pageSize, user.UserId, orderColumn)
+			tmpResult, tmpTotal, tmpErr := services.EsMultiMatchFunctionScoreQuerySort(indexName, keyWord, startSize, pageSize, user.UserId, orderColumn)
 			result = tmpResult
 			total = tmpTotal
 			err = tmpErr