|
|
@@ -391,6 +391,7 @@ func (this *ReportController) ArticleCategoryList() {
|
|
|
}
|
|
|
//查询用户今天是否看过时间线
|
|
|
haveMorningMeeting := false
|
|
|
+ var morningMeetingTime string
|
|
|
count, err := models.GetTimeLineRecordCount(user.UserId, industrialManagementId, time.Now().Format(utils.FormatDate))
|
|
|
if err != nil {
|
|
|
br.Msg = "查询浏览记录数量失败"
|
|
|
@@ -411,6 +412,7 @@ func (this *ReportController) ArticleCategoryList() {
|
|
|
if v.Readnum == 0 && user.CreatedTime.Before(utils.StrTimeToTime(v.PublishTime)) && utils.StrTimeToTime(utils.OnlineTime).Before(utils.StrTimeToTime(v.PublishTime)) {
|
|
|
if v.SubCategoryName == "时间线" {
|
|
|
haveMorningMeeting = true
|
|
|
+ morningMeetingTime = v.PublishTime
|
|
|
continue
|
|
|
}
|
|
|
timeLineItem.IsRed = true
|
|
|
@@ -420,7 +422,7 @@ func (this *ReportController) ArticleCategoryList() {
|
|
|
timeLineRed := false
|
|
|
if count == 0 {
|
|
|
timeLineRed = true
|
|
|
- } else if count > 0 && recordItem.CreateTime.Before(utils.StrTimeToTime(v.PublishTime)){
|
|
|
+ } else if count > 0 && recordItem.CreateTime.Before(utils.StrTimeToTime(morningMeetingTime)){
|
|
|
timeLineRed = true
|
|
|
}
|
|
|
if !timeLineItem.IsRed && timeLineRed && haveMorningMeeting {
|
ziwen