Merge branch '8.5fix' into debug

# Conflicts:
#	controllers/report.go

controllers/report.go

@@ -3061,30 +3061,21 @@ func (this *ReportController) StockNameList() {
 	for _, item := range list {
 		sliceSubjects := strings.Split(item.Stock, "/")
 		if len(sliceSubjects) > 0 {
-			if len(sliceSubjects) == 1{
-				for _, vSubject := range sliceSubjects {
-					sliceKuohao := strings.Split(vSubject, "(")           //过滤括号
-					sliceXiahuaxian := strings.Split(sliceKuohao[0], "-") //过滤下划线
-					subject := sliceXiahuaxian[0]
-					item.Stock = subject
-				}
-			} else {
-				for i, vSubject := range sliceSubjects {
-					sliceKuohao := strings.Split(vSubject, "(")           //过滤括号
-					sliceXiahuaxian := strings.Split(sliceKuohao[0], "-") //过滤下划线
-					subject := sliceXiahuaxian[0]
-					item.Stock = subject
-					if i> 0{
-						newItem := models.SummaryArticleStock{
-							Id:        item.Id,
-							ArticleId: item.ArticleId,
-							Stock:     subject,
-						}
-						list = append(list, &newItem)
+			for i, vSubject := range sliceSubjects {
+				sliceKuohao := strings.Split(vSubject, "(")           //过滤括号
+				sliceXiahuaxian := strings.Split(sliceKuohao[0], "-") //过滤下划线
+				subject := sliceXiahuaxian[0]
+				if i > 0 {
+					newItem := models.SummaryArticleStock{
+						Id:        item.Id,
+						ArticleId: item.ArticleId,
+						Stock:     subject,
 					}
+					list = append(list, &newItem)
+				} else {
+					item.Stock = subject
 				}
 			}
-
 		}
 
 		//index := strings.Index(item.Stock, "(")