Merge branch 'feature/eta_2.5.4_report_free_layout' into debug

controllers/report_v2.go

@@ -739,6 +739,10 @@ func (this *ReportController) Detail() {
 		}
 
 		if item.ReportLayout == 3 {
+			var chapterMap = make(map[int]bool)
+			for _, chapter := range tmpChapterList {
+				chapterMap[chapter.ReportChapterId] = true
+			}
 			pages, err := report.GetFreeLayoutChapterPagesByReportId(item.Id)
 			if err != nil {
 				br.Msg = "操作失败"
@@ -746,9 +750,11 @@ func (this *ReportController) Detail() {
 				return
 			}
 			for _, page := range pages {
-				page.Content = html.UnescapeString(page.Content)
-				page.ContentStruct = html.UnescapeString(page.ContentStruct)
-				pageList = append(pageList, page)
+				if chapterMap[page.ReportChapterId] {
+					page.Content = html.UnescapeString(page.Content)
+					page.ContentStruct = html.UnescapeString(page.ContentStruct)
+					pageList = append(pageList, page)
+				}
 			}
 		}
 		//item.Abstract = item.Title
@@ -1852,10 +1858,12 @@ func (this *ReportController) SubmitApprove() {
 			}
 		}
 	} else {
-		if reportItem.Content == "" && reportItem.ReportLayout != 3 {
-			br.Msg = "报告内容为空，不可提交"
-			br.ErrMsg = "报告内容为空，不可提交,report_id:" + strconv.Itoa(reportItem.Id)
-			return
+		if reportItem.ReportLayout != 3 {
+			if reportItem.Content == "" {
+				br.Msg = "报告内容为空，不可提交"
+				br.ErrMsg = "报告内容为空，不可提交,report_id:" + strconv.Itoa(reportItem.Id)
+				return
+			}
 		} else {
 			pages, err := report.GetFreeLayoutChapterPagesByReportId(reportItem.Id)
 			if err != nil {