|
@@ -701,6 +701,7 @@ func (this *ReportController) IndustryListByDepartment() {
|
|
|
br.ErrMsg = "获取失败,Err:" + err.Error()
|
|
|
return
|
|
|
}
|
|
|
+ subjectNamesNew = strings.TrimRight(subjectNamesNew, "/")
|
|
|
artList[k2].SubjectName = subjectNamesNew
|
|
|
artList[k2].DepartmentId = v.DepartmentId
|
|
|
artList[k2].IndustryName = industryName + "-" + subjectNamesNew
|
|
@@ -929,6 +930,7 @@ func (this *ReportController) ReportList() {
|
|
|
br.ErrMsg = "获取失败,Err:" + err.Error()
|
|
|
return
|
|
|
}
|
|
|
+ subjectNamesNew = strings.TrimRight(subjectNamesNew, "/")
|
|
|
list[k].SubjectName = subjectNamesNew
|
|
|
list[k].IndustryName = industryName + "-" + subjectNamesNew
|
|
|
}
|