|
@@ -162,6 +162,11 @@ func (this *ReportSelectionController) Detail() {
|
|
|
v2.CompanyLabel = append(v2.CompanyLabel, vCompanyLabel+"#")
|
|
|
}
|
|
|
}
|
|
|
+ if v2.SubjectName == "" {
|
|
|
+ v2.ShowName = v2.IndustrialManagementNames
|
|
|
+ } else {
|
|
|
+ v2.ShowName = v2.SubjectName
|
|
|
+ }
|
|
|
}
|
|
|
subjectItem := new(models.ReportSelectionChartLogSubjectName)
|
|
|
subjectItem.SubjectName = v2.SubjectName
|
|
@@ -174,6 +179,7 @@ func (this *ReportSelectionController) Detail() {
|
|
|
}
|
|
|
subjectItem.Md5String = utils.MD5(fmt.Sprint("IN_ID", v2.IndustrialManagementId, "S_ID", v2.IndustrialSubjectId))
|
|
|
v2.Md5String = subjectItem.Md5String
|
|
|
+
|
|
|
itemSubject.ListSubject = append(itemSubject.ListSubject, subjectItem)
|
|
|
//itemSubject.ListSubject = append(itemSubject.ListSubject, &models.ReportSelectionChartLogSubjectName{SubjectName: v2.SubjectName, IsNew: v2.IsNew, IndustrialSubjectId: v2.IndustrialSubjectId})
|
|
|
}
|