合并分支

controllers/report_v2.go

@@ -1031,24 +1031,25 @@ func (this *ReportController) SaveReportContent() {
 				for _, v := range ormList {
 					go func(v *report.ReportFreeLayout) {
 						defer wg.Done()
-						content = v.Content
-						content = services.HandleReportContent(content, "del", nil)
-						if content != "" {
-							e = utils.ContentXssCheck(content)
-							if e != nil {
+						pageContent := v.Content
+						pageContent = services.HandleReportContent(pageContent, "del", nil)
+						if pageContent != "" {
+							pageErr := utils.ContentXssCheck(pageContent)
+							if pageErr != nil {
 								br.Msg = "存在非法标签"
-								br.ErrMsg = "存在非法标签, Err: " + e.Error()
+								br.ErrMsg = "存在非法标签, Err: " + pageErr.Error()
 								return
 							}
-							contentClean, e := services.FilterReportContentBr(content)
-							if e != nil {
+							var pageContentClean string
+							pageContentClean, pageErr = services.FilterReportContentBr(pageContent)
+							if pageErr != nil {
 								br.Msg = "内容去除前后空格失败"
-								br.ErrMsg = "内容去除前后空格失败, Err: " + e.Error()
+								br.ErrMsg = "内容去除前后空格失败, Err: " + pageErr.Error()
 								return
 							}
-							content = contentClean
+							pageContent = pageContentClean
 							v.ContentStruct = services.HandleReportContentStruct(v.ContentStruct, "del", nil)
-							v.Content = html.EscapeString(content)
+							v.Content = html.EscapeString(pageContent)
 							v.ContentStruct = html.EscapeString(v.ContentStruct)
 						}
 					}(v)