Merge branch 'bugfix_9.18'

controllers/english_report/report.go

@@ -265,6 +265,10 @@ func (this *EnglishReportController) Detail() {
 	}
 	item, err := models.GetEnglishReportById(reportId)
 	if err != nil {
+		if err.Error() == utils.ErrNoRow() {
+			br.Msg = "报告已被删除"
+			return
+		}
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败，Err:" + err.Error()
 		return

controllers/report.go

@@ -692,6 +692,10 @@ func (this *ReportController) Detail() {
 	}
 	item, err := models.GetReportById(reportId)
 	if err != nil {
+		if err.Error() == utils.ErrNoRow() {
+			br.Msg = "报告已被删除"
+			return
+		}
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败，Err:" + err.Error()
 		return