Merge remote-tracking branch 'origin/feature/eta_2.5.4_report_free_layout' into debug

# Conflicts:
#	models/report.go

models/report.go

@@ -1704,13 +1704,13 @@ type ReportShartUrlResp struct {
 	UrlToken string `description:"分享链接token"`
 }
 
-
 func GetAllPublishReportId() (items []int, err error) {
 	o := global.DbMap[utils.DbNameReport]
 	sql := `SELECT  a.id FROM report as a WHERE 1=1 AND state in (2,6) `
 	err = o.Raw(sql).Find(&items).Error
 	return
 }
+
 func InsertOrUpdateReportFreeLayoutContentPage(reportInfo *Report, ormList []*report.ReportFreeLayout) (err error) {
 	tx := global.DbMap[utils.DbNameReport].Begin()
 
@@ -1755,5 +1755,4 @@ func UpdateChapterFreeLayoutContentPage(reportInfo *Report, chapterInfo *ReportC
 		}
 	}
 	return report.BatchInsertOrUpdatePages(tx, ormList, true, reportInfo.Id, chapterInfo.ReportChapterId)
-
 }

services/report_rai.go

@@ -290,7 +290,8 @@ func handleInsertRaiReport(articleResult models.ArticleResultApidate) (err error
 			// 新增报告及章节
 			var reportId int64
 			allGrantUserList := make([]*report.ReportGrant, 0)
-			reportId, err = models.AddReportAndChapter(item, allGrantUserList, []models.AddReportChapter{})
+			reportFreeLayoutList := make([]*report.ReportFreeLayout, 0)
+			reportId, err = models.AddReportAndChapter(item, reportFreeLayoutList, allGrantUserList, []models.AddReportChapter{})
 			if err != nil {
 				err = fmt.Errorf("新增报告及章节失败, Err: " + err.Error())
 				return