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

controllers/report.go

@@ -2257,7 +2257,7 @@ func (this *ReportController) SearchReport() {
 			listYx[k].IsCollect = true
 		}
 	}
-	listHz, err := models.GetReoprtSearchList(` AND a.article_id < 1000000 `+condition, user.UserId)
+	listHz, err := models.GetReoprtSearchList(` AND a.article_id < 1000000 `+condition+` OR ( article_type = 'lyjh' `+condition+`) `, user.UserId)
 	if err != nil {
 		br.Msg = "获取信息失败"
 		br.ErrMsg = "获取文章列表失败,Err:" + err.Error()