Эх сурвалжийг харах

fix: 报告分类改名不生效

hsun 2 жил өмнө
parent
commit
c364119a62

+ 7 - 3
services/report/report.go

@@ -820,9 +820,11 @@ func GetReportList(user user.UserInfo, keyWord string, classifyIdFirst, classify
 			return
 		}
 		listImgMap := make(map[int]string, 0)
+		classifyNameMap := make(map[int]string, 0)
 		classifyLen := len(classifyList)
 		for i := 0; i < classifyLen; i++ {
 			listImgMap[classifyList[i].Id] = classifyList[i].YbListImg
+			classifyNameMap[classifyList[i].Id] = classifyList[i].ClassifyName
 		}
 
 		var videoReportIds []int
@@ -861,8 +863,10 @@ func GetReportList(user user.UserInfo, keyWord string, classifyIdFirst, classify
 			// 样式限制行数
 			reportItem.Title = "<div style=\"-webkit-line-clamp: 2;-webkit-box-orient: vertical;display: -webkit-box;overflow: hidden;text-overflow: ellipsis;\">" + reportInfo.Title + "</div>"
 			reportItem.PublishTime = reportInfo.PublishTime
-			reportItem.ClassifyNameFirst = reportInfo.ClassifyNameFirst
-			reportItem.ClassifyNameSecond = reportInfo.ClassifyNameSecond
+			//reportItem.ClassifyNameFirst = reportInfo.ClassifyNameFirst
+			//reportItem.ClassifyNameSecond = reportInfo.ClassifyNameSecond
+			reportItem.ClassifyNameFirst = classifyNameMap[reportInfo.ClassifyIdFirst]
+			reportItem.ClassifyNameSecond = classifyNameMap[reportInfo.ClassifyIdSecond]
 			reportItem.ClassifyIdFirst = reportInfo.ClassifyIdFirst
 			reportItem.ClassifyIdSecond = reportInfo.ClassifyIdSecond
 			reportItem.Stage = reportInfo.Stage
@@ -877,7 +881,7 @@ func GetReportList(user user.UserInfo, keyWord string, classifyIdFirst, classify
 			}
 			reportItem.TitleInfo = fmt.Sprintf("【第%s期|FICC|%s】", stageStr, reportItem.ClassifyNameSecond)
 			//trimClassifyNameSecond := utils.TrimHtml(reportInfo.ClassifyNameSecond)
-			if reportInfo.ClassifyNameFirst == "晨报" || reportInfo.ClassifyNameFirst == "周报" || classifyIdSecond > 0 {
+			if reportItem.ClassifyNameFirst == "晨报" || reportItem.ClassifyNameFirst == "周报" || classifyIdSecond > 0 {
 				//reportItem.ReportImgUrl = utils.ALIYUN_YBIMG_HOST + reportImgUrl
 				reportItem.TitleInfo = fmt.Sprintf("【第%s期|FICC|%s】", stageStr, reportItem.ClassifyNameFirst)
 			}