Merge branch 'cygx_9.2' into debug

controllers/report.go

@@ -385,8 +385,10 @@ func (this *ReportController) ArticleCategoryList() {
 		//查询用户今天是否看过时间线
 		count, err := models.GetTimeLineRecordCount(user.UserId, industrialManagementId,time.Now().Format(utils.FormatDate))
 		for _, v := range timeLineList {
-			if count == 0 && v.Readnum == 0 && user.CreatedTime.Before(utils.StrTimeToTime(v.PublishTime)) && utils.StrTimeToTime(utils.OnlineTime).Before(utils.StrTimeToTime(v.PublishTime)) {
-				timeLineItem.IsRed = true
+			if v.Readnum == 0 && user.CreatedTime.Before(utils.StrTimeToTime(v.PublishTime)) && utils.StrTimeToTime(utils.OnlineTime).Before(utils.StrTimeToTime(v.PublishTime)) {
+				if count == 0 {
+					timeLineItem.IsRed = true
+				}
 			}
 		}
 
@@ -631,7 +633,10 @@ func (this *ReportController) List() {
 		//查询用户今天是否看过时间线
 		count, err := models.GetTimeLineRecordCount(user.UserId, industrialManagementId,time.Now().Format(utils.FormatDate))
 		for k, v := range list {
-			if count == 0 && v.Readnum == 0 && user.CreatedTime.Before(utils.StrTimeToTime(v.PublishTime)) && utils.StrTimeToTime(utils.OnlineTime).Before(utils.StrTimeToTime(v.PublishTime)) {
+			if v.Readnum == 0 && user.CreatedTime.Before(utils.StrTimeToTime(v.PublishTime)) && utils.StrTimeToTime(utils.OnlineTime).Before(utils.StrTimeToTime(v.PublishTime)) {
+				list[k].IsRed = true
+			}
+			if v.SubCategoryName == "时间线" && count == 0 {
 				list[k].IsRed = true
 			}
 			if v.VideoUrl != "" {