Merge branch 'cygx_9.6' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/report.go

@@ -1620,14 +1620,13 @@ func (this *ReportController) Detail() {
 				return
 			}
 			for _, v := range listLogLast {
-				mapBodyChartSummary[v.IndustrialSubjectId] = v.Body
+				mapBodyChartSummary[v.IndustrialSubjectId], _ = services.GetReportContentTextSubNew(v.Body)
 				mapLabel[v.IndustrialSubjectId] = v.Label
 			}
 		}
 	} else {
 		isAllNew = true
 	}
-	fmt.Println(mapLabel)
 	detail.PublishDate = utils.StrTimeToTime(detail.PublishDate).Format("2006-01-02")
 	existMap := make(map[int]int)
 	var items []*models.ReportSelectionChartPermission
@@ -1669,7 +1668,8 @@ func (this *ReportController) Detail() {
 				if isAllNew {
 					isNew = true
 				} else {
-					if mapBodyChartSummary[v2.IndustrialSubjectId] != v2.Body || mapLabel[v2.IndustrialSubjectId] != v2.Label {
+					v2Body, _ := services.GetReportContentTextSubNew(v2.Body)
+					if mapBodyChartSummary[v2.IndustrialSubjectId] != v2Body || mapLabel[v2.IndustrialSubjectId] != v2.Label {
 						isNew = true
 					}
 				}