Merge branch 'cygx_9.2' into debug

controllers/report.go

@@ -2905,7 +2905,7 @@ func (this *ReportController) SearchReportAndResource() {
 				mapHistroyArticleId[v.ArticleId] = v.ArticleId
 			}
 		}
-		condition2 := ` AND man.industry_name IN (` + "'"+keyWord+ "'" + `)`
+		condition2 := ` AND man.industry_name LIKE '%` + keyWord + `%' `
 		list, err := models.GetIndustrialManagementAll(uid, condition2, orderSrt, 0, 20)
 		if err != nil {
 			br.Msg = "获取信息失败"