Merge branch 'need/cygx_959' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/report_selection.go

@@ -166,6 +166,11 @@ func (this *ReportSelectionController) Detail() {
 					if v2.Label != "" {
 						v2.CompanyLabel = strings.Split(v2.Label, "{|}")
 					}
+					if v2.SubjectName == "" {
+						v2.ShowName = v2.IndustrialManagementNames
+					} else {
+						v2.ShowName = v2.SubjectName
+					}
 				}
 				subjectItem := new(models.ReportSelectionChartLogSubjectName)
 				subjectItem.SubjectName = v2.SubjectName

models/report_selection.go

@@ -88,6 +88,7 @@ type CygxReportSelectionLogDetail struct {
 	OverviewArticleId         int      `description:"综述报告Id"`
 	IsShowOverviewArticle     int      `description:"是否展示综述报告 1展示，0隐藏"`
 	Md5String                 string   `description:"Md5唯一标识"`
+	ShowName                  string   `description:"展示名称"`
 	List                      []*IndustriaReportSelection
 }
 type IndustriaReportSelection struct {