Merge branch 'cygx_14.2' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/report.go

@@ -3210,6 +3210,8 @@ func (this *ReportController) SearchReportAndResource() {
 			br.ErrMsg = "获取信息失败,Err:" + err.Error()
 			return
 		}
+	} else {
+		listHzResource = make([]*models.IndustrialManagement, 0)
 	}
 
 	//condition = `  AND a.publish_status = 1 AND a.article_type_id IN (` + articleTypeIds + `)  AND (m.industry_name LIKE '%` + keyWord + `%' OR m.subject_names LIKE '%` + keyWord + `%'  )  `