فهرست منبع

fix:列表也返回是否有章节的字段

Roc 10 ماه پیش
والد
کامیت
8945be2c1b
3فایلهای تغییر یافته به همراه4 افزوده شده و 1 حذف شده
  1. 1 0
      models/response/report.go
  2. 1 0
      services/report/report.go
  3. 2 1
      services/report/report_chapter.go

+ 1 - 0
models/response/report.go

@@ -54,6 +54,7 @@ type ReportItem struct {
 	ContentSub         string    `description:"内容前两个章节" json:"content_sub"`
 	ContentSub         string    `description:"内容前两个章节" json:"content_sub"`
 	BannerUrl          string    `description:"详情页banner" json:"banner_url"`
 	BannerUrl          string    `description:"详情页banner" json:"banner_url"`
 	ShareBgImg         string    `description:"分享背景图" json:"share_bg_img"`
 	ShareBgImg         string    `description:"分享背景图" json:"share_bg_img"`
+	HasChapter         int       `description:"是否有章节" json:"has_chapter"`
 	ReportLayout       int8      `description:"报告布局,1:常规布局,2:智能布局。默认:1" json:"report_layout"`
 	ReportLayout       int8      `description:"报告布局,1:常规布局,2:智能布局。默认:1" json:"report_layout"`
 	HeadImg            string    `description:"报告头图地址" json:"head_img"`
 	HeadImg            string    `description:"报告头图地址" json:"head_img"`
 	EndImg             string    `description:"报告尾图地址" json:"end_img"`
 	EndImg             string    `description:"报告尾图地址" json:"end_img"`

+ 1 - 0
services/report/report.go

@@ -432,6 +432,7 @@ func GetReportDetail(userinfo user.UserInfo, reportId int) (reportDetail respons
 	reportItem.ContentSub = html.UnescapeString(reportInfo.ContentSub)
 	reportItem.ContentSub = html.UnescapeString(reportInfo.ContentSub)
 	reportItem.Frequency = reportInfo.Frequency
 	reportItem.Frequency = reportInfo.Frequency
 	reportItem.VideoName = reportInfo.VideoName
 	reportItem.VideoName = reportInfo.VideoName
+	reportItem.HasChapter = reportInfo.HasChapter
 	reportItem.ReportLayout = reportInfo.ReportLayout
 	reportItem.ReportLayout = reportInfo.ReportLayout
 	reportItem.HeadImg = reportInfo.HeadImg
 	reportItem.HeadImg = reportInfo.HeadImg
 	reportItem.EndImg = reportInfo.EndImg
 	reportItem.EndImg = reportInfo.EndImg

+ 2 - 1
services/report/report_chapter.go

@@ -96,7 +96,7 @@ func GetChapterListByReport(classifyNameFirst string, reportId int, validWeekTyp
 		typeIds = append(typeIds, int(v.ReportChapterTypeId))
 		typeIds = append(typeIds, int(v.ReportChapterTypeId))
 	}
 	}
 
 
-	if classifyNameFirst == "周报" {
+	if classifyNameFirst != "晨报" {
 		for _, v := range validWeekTypeIds {
 		for _, v := range validWeekTypeIds {
 			newTypeMap[v] = true
 			newTypeMap[v] = true
 		}
 		}
@@ -413,6 +413,7 @@ func CheckDayReportPermission(userInfo user.UserInfo, productAuthOk bool) (authO
 		return
 		return
 	}
 	}
 	authOk, permissionCheckInfo, _, err = company.GetCheckPermission(userInfo.CompanyID, int(userInfo.UserID), []int{})
 	authOk, permissionCheckInfo, _, err = company.GetCheckPermission(userInfo.CompanyID, int(userInfo.UserID), []int{})
+
 	return
 	return
 }
 }