|
|
@@ -162,16 +162,15 @@ func (this *ReportSelectionController) Detail() {
|
|
|
v2.CompanyLabel = append(v2.CompanyLabel, vCompanyLabel+"#")
|
|
|
}
|
|
|
}
|
|
|
- if v2.ThirdName != "" {
|
|
|
- v2.ShowName = v2.ThirdName
|
|
|
+ if v2.SubjectName == "" {
|
|
|
+ v2.ShowName = v2.IndustrialManagementNames
|
|
|
} else {
|
|
|
- if v2.SubjectName == "" {
|
|
|
- v2.ShowName = v2.IndustrialManagementNames
|
|
|
- } else {
|
|
|
- v2.ShowName = v2.SubjectName
|
|
|
- }
|
|
|
+ v2.ShowName = v2.SubjectName
|
|
|
}
|
|
|
}
|
|
|
+ if v2.ThirdName != "" {
|
|
|
+ v2.ShowName = v2.ThirdName
|
|
|
+ }
|
|
|
subjectItem := new(models.ReportSelectionChartLogSubjectName)
|
|
|
subjectItem.SubjectName = v2.SubjectName
|
|
|
subjectItem.IsNew = v2.IsNew
|
