Browse Source

fix:今日研报

zqbao 8 months ago
parent
commit
51a3f1188c
1 changed files with 41 additions and 36 deletions
  1. 41 36
      controllers/report.go

+ 41 - 36
controllers/report.go

@@ -389,53 +389,58 @@ func (this *ReportController) DailyList() {
 		br.ErrMsg = resp.ErrMsg
 		return
 	}
-	reportPdfList, err := models.GetReportPdfDailyList()
-	if err != nil {
-		br.Msg = "研报列表查询失败"
-		br.ErrMsg = "研报列表查询失败,系统异常,Err:" + err.Error()
-		return
-	}
 	reportList := resp.Data
 	for _, v := range reportList.List {
 		v.ReportType = utils.ReportTypeEta
 	}
-	var classifyIds []int
-	for _, v := range reportPdfList {
-		classifyIds = append(classifyIds, v.ClassifyIdSecond)
-	}
-	classifyResp, err := services.GetFirstChartPermission(classifyIds)
+
+	reportPdfList, err := models.GetReportPdfDailyList()
 	if err != nil {
 		br.Msg = "研报列表查询失败"
 		br.ErrMsg = "研报列表查询失败,系统异常,Err:" + err.Error()
 		return
 	}
-	if classifyResp.Ret != 200 {
-		br.Msg = classifyResp.Msg
-		br.ErrMsg = classifyResp.ErrMsg
-		return
-	}
-	classifyPermissionMap := make(map[int][]string)
-	for _, v := range classifyResp.Data {
-		classifyPermissionMap[v.ClassifyId] = v.PermissionNames
-	}
+	var classifyIds []int
 	for _, v := range reportPdfList {
-		reportList.List = append(reportList.List, &models.ReportView{
-			Id:                 v.ReportPdfId,
-			ClassifyIdFirst:    v.ClassifyIdFirst,
-			ClassifyNameFirst:  v.ClassifyNameFirst,
-			ClassifyIdSecond:   v.ClassifyIdSecond,
-			ClassifyNameSecond: v.ClassifyNameSecond,
-			PermissionNames:    classifyPermissionMap[v.ClassifyIdSecond],
-			PdfUrl:             v.PdfUrl,
-			Title:              v.Title,
-			Abstract:           v.Abstract,
-			Stage:              v.Stage,
-			Author:             v.Author,
-			ReportType:         utils.ReportTypePdf,
-			PublishTime:        v.PublishTime.Format(utils.FormatDateTime),
-			ModifyTime:         v.ModifyTime,
-		})
+		classifyIds = append(classifyIds, v.ClassifyIdSecond)
+	}
+
+	if len(classifyIds) > 0 {
+		classifyResp, err := services.GetFirstChartPermission(classifyIds)
+		if err != nil {
+			br.Msg = "研报列表查询失败"
+			br.ErrMsg = "研报列表查询失败,系统异常,Err:" + err.Error()
+			return
+		}
+		if classifyResp.Ret != 200 {
+			br.Msg = classifyResp.Msg
+			br.ErrMsg = classifyResp.ErrMsg
+			return
+		}
+		classifyPermissionMap := make(map[int][]string)
+		for _, v := range classifyResp.Data {
+			classifyPermissionMap[v.ClassifyId] = v.PermissionNames
+		}
+		for _, v := range reportPdfList {
+			reportList.List = append(reportList.List, &models.ReportView{
+				Id:                 v.ReportPdfId,
+				ClassifyIdFirst:    v.ClassifyIdFirst,
+				ClassifyNameFirst:  v.ClassifyNameFirst,
+				ClassifyIdSecond:   v.ClassifyIdSecond,
+				ClassifyNameSecond: v.ClassifyNameSecond,
+				PermissionNames:    classifyPermissionMap[v.ClassifyIdSecond],
+				PdfUrl:             v.PdfUrl,
+				Title:              v.Title,
+				Abstract:           v.Abstract,
+				Stage:              v.Stage,
+				Author:             v.Author,
+				ReportType:         utils.ReportTypePdf,
+				PublishTime:        v.PublishTime.Format(utils.FormatDateTime),
+				ModifyTime:         v.ModifyTime,
+			})
+		}
 	}
+
 	sort.Sort(models.ByPublishTimeReportView(reportList.List))
 
 	br.Data = reportList