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

controllers/search.go

@@ -491,6 +491,9 @@ func (this *SearchController) ListHomeArtAndChart() {
 	if chartTotal > int(total) {
 		total = int64(chartTotal)
 	}
+	if listType == 1 {
+		total = total + int64(chartTotal)
+	}
 	page := paging.GetPaging(currentIndex, pageSize, int(total))
 	resp.Paging = page
 	resp.List = result