Merge branch 'master' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/report.go

@@ -2819,7 +2819,7 @@ func (this *ReportController) SearchReportAndResource() {
 	if pageSize > 0 {
 		sqlGroup += ` LIMIT 5 `
 	} else {
-		pageSize = 50
+		sqlGroup += ` LIMIT 100 `
 	}
 	ListYxReport, err := models.GetArticleCollectionList(` AND a.article_id >= 1000000 `+condition+sqlGroup, user.UserId)
 	if err != nil {