|
@@ -156,18 +156,24 @@ func (this *ReportSelectionController) Detail() {
|
|
|
}
|
|
|
listSonLog[k2].List = listIndustrial
|
|
|
//listSonLog[k2].IsShowApplyButton = true
|
|
|
- if v2.Label != "" {
|
|
|
- CompanyLabelSlice := strings.Split(v2.Label, "{|}")
|
|
|
- for _, vCompanyLabel := range CompanyLabelSlice {
|
|
|
- v2.CompanyLabel = append(v2.CompanyLabel, vCompanyLabel+"#")
|
|
|
- }
|
|
|
- }
|
|
|
+ //if v2.Label != "" {
|
|
|
+ // CompanyLabelSlice := strings.Split(v2.Label, "{|}")
|
|
|
+ // for _, vCompanyLabel := range CompanyLabelSlice {
|
|
|
+ // v2.CompanyLabel = append(v2.CompanyLabel, vCompanyLabel+"#")
|
|
|
+ // }
|
|
|
+ //}
|
|
|
if v2.SubjectName == "" {
|
|
|
v2.ShowName = v2.IndustrialManagementNames
|
|
|
} else {
|
|
|
v2.ShowName = v2.SubjectName
|
|
|
}
|
|
|
}
|
|
|
+ if v2.Label != "" {
|
|
|
+ CompanyLabelSlice := strings.Split(v2.Label, "{|}")
|
|
|
+ for _, vCompanyLabel := range CompanyLabelSlice {
|
|
|
+ v2.CompanyLabel = append(v2.CompanyLabel, vCompanyLabel+"#")
|
|
|
+ }
|
|
|
+ }
|
|
|
if v2.ThirdName != "" {
|
|
|
v2.ShowName = v2.ThirdName
|
|
|
}
|