Merge branch 'cygx4.2_web' of http://8.136.199.33:3000/cxzhang/hongze_clpt into debug

controllers/report_selection.go

@@ -115,6 +115,7 @@ func (this *ReportSelectionController) Detail() {
 		if existMap[v.ChartPermissionId] == 0 {
 			//item.PermissionName = v.PermissionName + "领域深度报告和调研"
 			item.PermissionName = v.PermissionName
+			item.ChartPermissionId = v.ChartPermissionId
 			item.IcoLink = v.IcoLink
 			listSonLog, err := models.GetReportSelectionlogSonListAll(articleId, v.ChartPermissionId)
 			if err != nil && err.Error() != utils.ErrNoRow() {

models/report_selection.go

@@ -52,10 +52,11 @@ type ReportSelectionLetailResp struct {
 }
 
 type ReportSelectionChartPermission struct {
-	PermissionName   string `description:"权限名称"`
-	IcoLink          string `orm:"column(image_url)"description:"图标链接"`
-	List             []*CygxReportSelectionLogDetail
-	BodyChartSummary string `description:"行业核心逻辑汇总"`
+	PermissionName    string `description:"权限名称"`
+	ChartPermissionId int    `description:"权限名称"`
+	IcoLink           string `orm:"column(image_url)"description:"图标链接"`
+	List              []*CygxReportSelectionLogDetail
+	BodyChartSummary  string `description:"行业核心逻辑汇总"`
 }
 
 type ReportSelectionChartLogPermission struct {