|
@@ -72,12 +72,21 @@ func AddReportAndChapter(reportInfo *models.Report, inheritReportId int, grantAd
|
|
|
reportInfo.Content = inheritReport.Content
|
|
|
reportInfo.ContentSub = inheritReport.ContentSub
|
|
|
reportInfo.ContentStruct = inheritReport.ContentStruct
|
|
|
- reportInfo.HeadImg = inheritReport.HeadImg
|
|
|
- reportInfo.EndImg = inheritReport.EndImg
|
|
|
reportInfo.CanvasColor = inheritReport.CanvasColor
|
|
|
- reportInfo.NeedSplice = inheritReport.NeedSplice
|
|
|
+ //reportInfo.NeedSplice = inheritReport.NeedSplice
|
|
|
+ reportInfo.NeedSplice = 1
|
|
|
reportInfo.HeadResourceId = inheritReport.HeadResourceId
|
|
|
+ //reportInfo.HeadImg = inheritReport.HeadImg
|
|
|
+ //reportInfo.EndImg = inheritReport.EndImg
|
|
|
+ reportInfo.HeadImg = ``
|
|
|
+ reportInfo.EndImg = ``
|
|
|
reportInfo.EndResourceId = inheritReport.EndResourceId
|
|
|
+ if inheritReport.HeadResourceId > 0 {
|
|
|
+ reportInfo.HeadImg = inheritReport.HeadImg
|
|
|
+ }
|
|
|
+ if inheritReport.EndResourceId > 0 {
|
|
|
+ reportInfo.EndImg = inheritReport.EndImg
|
|
|
+ }
|
|
|
reportInfo.InheritReportId = inheritReport.Id
|
|
|
}
|
|
|
}
|