Merge branch 'eta/2.4.5' into debug

# Conflicts:
#	controllers/report_chapter.go
#	controllers/report_v2.go
#	models/business_conf.go
#	utils/constants.go

controllers/report_chapter.go

@@ -364,6 +364,7 @@ func (this *ReportController) EditDayWeekChapter() {
 	// 更新章节及指标
 	contentSub := ""
 	if req.Content != "" {
+		// 处理关联excel的表格id
 		req.Content = services.HandleReportContentTable(reportInfo.Id, req.Content)
 		req.Content = services.HandleReportContent(req.Content, "del", nil)
 		e := utils.ContentXssCheck(req.Content)
@@ -406,7 +407,6 @@ func (this *ReportController) EditDayWeekChapter() {
 	reportChapterInfo.LastModifyAdminId = sysUser.AdminId
 	reportChapterInfo.LastModifyAdminName = sysUser.RealName
 	reportChapterInfo.ContentModifyTime = time.Now()
-
 	if req.ContentStruct != `` {
 		req.ContentStruct = services.HandleReportContentStructTable(reportChapterInfo.ReportId, req.ContentStruct)
 		req.ContentStruct = services.HandleReportContentStruct(req.ContentStruct, "del", nil)

controllers/report_v2.go

@@ -652,6 +652,7 @@ func (this *ReportController) Edit() {
 	req.ContentStruct = services.HandleReportContentStructTable(int(req.ReportId), req.ContentStruct)
 	req.Content = services.HandleReportContent(req.Content, "del", nil)
 	req.ContentStruct = services.HandleReportContentStruct(req.ContentStruct, "del", nil)
+	
 	// 编辑报告信息
 	err, errMsg := services.EditReport(reportInfo, req, sysUser)
 	if err != nil {
@@ -767,7 +768,14 @@ func (this *ReportController) Detail() {
 		}
 	}
 
-	businessConf, err := models.GetBusinessConfByKey(models.BusinessConfIsOpenChartExpired)
+	item.Content = services.HandleReportContentTable(item.Id, item.Content)
+	item.ContentStruct = services.HandleReportContentStructTable(item.Id, item.ContentStruct)
+	for _, v := range chapterList {
+		v.Content = services.HandleReportContentTable(item.Id, v.Content)
+		v.ContentStruct = services.HandleReportContentStructTable(item.Id, v.ContentStruct)
+	}
+
+    businessConf, err := models.GetBusinessConfByKey(models.BusinessConfIsOpenChartExpired)
 	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取配置失败，Err:" + err.Error()
@@ -785,13 +793,6 @@ func (this *ReportController) Detail() {
 
 	}
 
-	item.Content = services.HandleReportContentTable(item.Id, item.Content)
-	item.ContentStruct = services.HandleReportContentStructTable(item.Id, item.ContentStruct)
-	for _, v := range chapterList {
-		v.Content = services.HandleReportContentTable(item.Id, v.Content)
-		v.ContentStruct = services.HandleReportContentStructTable(item.Id, v.ContentStruct)
-	}
-
 	resp := &models.ReportDetailView{
 		ReportDetail: item,
 		ChapterList:  chapterList,

models/business_conf.go

@@ -46,7 +46,8 @@ const (
 	BusinessConfLoginEmailTemplateSubject    = "LoginEmailTemplateSubject"
 	BusinessConfLoginEmailTemplateContent    = "LoginEmailTemplateContent"
 	BusinessConfLdapBindUserSuffix           = "LdapBindUserSuffix"
-	BusinessConfLdapUserFilter               = "LdapUserFilter"
+	BusinessConfLdapUserFilter            = "LdapUserFilter"
+
 	BusinessConfTencentApiSecretId           = "TencentApiSecretId"           // 腾讯云API-密钥对
 	BusinessConfTencentApiSecretKey          = "TencentApiSecretKey"          // 腾讯云API-密钥对
 	BusinessConfTencentApiRecTaskCallbackUrl = "TencentApiRecTaskCallbackUrl" // 腾讯云API-语音识别回调地址