Merge branch 'cygx_9.2' into debug

controllers/report.go

@@ -374,6 +374,17 @@ func (this *ReportController) ArticleCategoryList() {
 			CategoryId:    99999,
 			MatchTypeName: "时间线",
 		}
+		timeLineList, err := models.GetTimeLineReportIndustrialList(user.UserId, industrialManagementId, 0, 30)
+		if err != nil {
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "获取帖子数据失败，Err:" + err.Error()
+			return
+		}
+		for _, v := range timeLineList {
+			if v.Readnum == 0 && user.CreatedTime.Before(utils.StrTimeToTime(v.PublishTime)) && utils.StrTimeToTime(utils.OnlineTime).Before(utils.StrTimeToTime(v.PublishTime)) {
+				timeLineItem.IsRed = true
+			}
+		}
 
 		list = append([]*models.IndustrialToArticleCategoryRep{&timeLineItem}, list...)
 	}