Browse Source

Merge branch 'yb/3.0' of hongze/hongze_yb into master

hsun 2 years ago
parent
commit
8e3adc3855
1 changed files with 2 additions and 1 deletions
  1. 2 1
      services/report/report.go

+ 2 - 1
services/report/report.go

@@ -772,10 +772,11 @@ func GetReportList(user user.UserInfo, keyWord string, classifyIdFirst, classify
 				stageStr = strconv.Itoa(reportInfo.Stage)
 			}
 			reportItem.TitleInfo = fmt.Sprintf("【第%s期|FICC|%s】", stageStr, reportItem.ClassifyNameSecond)
+			trimClassifyNameSecond := utils.TrimHtml(reportInfo.ClassifyNameSecond)
 			if reportInfo.ClassifyNameFirst == "晨报" || reportInfo.ClassifyNameFirst == "周报" || classifyIdSecond > 0 {
 				reportItem.ReportImgUrl = utils.ALIYUN_YBIMG_HOST + reportImgUrl
 				reportItem.TitleInfo = fmt.Sprintf("【第%s期|FICC|%s】", stageStr, reportItem.ClassifyNameFirst)
-			} else if url, ok := permissionImageMap[reportInfo.ClassifyNameSecond]; ok {
+			} else if url, ok := permissionImageMap[trimClassifyNameSecond]; ok {
 				reportItem.ReportImgUrl = utils.ALIYUN_YBIMG_HOST + url
 			}
 			if img, ok := reportImgMap[reportInfo.ClassifyNameFirst]; ok {