From 7ed5a04a549388615bf46bb751095655d9e9caab Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Wed, 14 Sep 2016 10:25:11 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E8=AE=A8=E8=AE=BA=E5=8C=BA?=
 =?UTF-8?q?=E5=92=8C=E9=80=9A=E7=9F=A5=E7=BC=93=E5=AD=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_course_boardlist.html.erb | 5 +++--
 app/views/users/_course_newslist.html.erb  | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/views/users/_course_boardlist.html.erb b/app/views/users/_course_boardlist.html.erb
index d49d1ad3d..0b2519e9e 100644
--- a/app/views/users/_course_boardlist.html.erb
+++ b/app/views/users/_course_boardlist.html.erb
@@ -17,7 +17,8 @@
     <div class="bloglistbox">
       <% if topics.any? %>
           <% topics.each do |activity| %>
-              <% cache [:course_boardslist_one,activity.id.to_s] do%>
+              <% update_time = activity.children.any? ? activity.children.last[:created_on] : activity[:created_on]%>
+              <% cache [:course_boardslist_one,activity.id.to_s+"-"+(activity.sticky).to_s+"-"+(activity.locked).to_s+"-"+update_time.to_i.to_s+activity[:update_on].to_i.to_s] do%>
                   <div class="list-file">
                     <div><span class="item_list fl"></span>
                       <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
@@ -46,7 +47,7 @@
                       <span class="grayTxt">
                           发帖人: <%=(u.try(:realname) != " " ? u.lastname + u.firstname : u.try(:login)) %>
                       </span>
-                      <span class="grayTxt">更新：<%= format_time(activity.children.any? ? activity.children.last[:created_on] : activity[:created_on] ) %></span>
+                      <span class="grayTxt">更新：<%= format_time(update_time) %></span>
                       <% all_comments = []%>
                       <% count=get_all_children(all_comments, activity).count %>
                       <p class="list-info fr grayTxt"><span><%= count>0 ? "#{count}" : "0" %></span><span>回复</span><span>|</span><span><%= get_praise_num(activity) > 0 ? "#{get_praise_num(activity)}" : "0" %></span><span>赞</span></p>
diff --git a/app/views/users/_course_newslist.html.erb b/app/views/users/_course_newslist.html.erb
index 83cd1304f..1792aba8c 100644
--- a/app/views/users/_course_newslist.html.erb
+++ b/app/views/users/_course_newslist.html.erb
@@ -17,7 +17,8 @@
     <div class="bloglistbox">
       <% if topics.any? %>
           <% topics.each do |activity| %>
-              <% cache [:course_newslist_one,activity.id.to_s] do%>
+              <% update_time = CourseActivity.where("course_act_type='#{activity.class}' and course_act_id =#{activity.id}").first.updated_at%>
+              <% cache [:course_newslist_one,activity.id.to_s+"-"+(activity.sticky == 1).to_s+"-"+update_time.to_i.to_s] do%>
                   <div class="list-file">
                     <div><span class="item_list fl"></span>
                       <%= link_to activity.title.to_s, news_path(activity), :class => "list-title fl" %>
@@ -34,7 +35,7 @@
                       <span class="grayTxt">
                           发布者: <%=(u.try(:realname) != " " ? u.lastname + u.firstname : u.try(:login)) %>
                       </span>
-                      <span class="grayTxt">更新：<%= format_time(CourseActivity.where("course_act_type='#{activity.class}' and course_act_id =#{activity.id}").first.updated_at) %></span>
+                      <span class="grayTxt">更新：<%= format_time(update_time) %></span>
                       <% count=0 %>
                       <% count=activity.comments.count %>
                       <p class="list-info fr grayTxt"><span><%= count>0 ? "#{count}" : "0" %></span><span>回复</span><span>|</span><span><%= get_praise_num(activity) > 0 ? "#{get_praise_num(activity)}" : "0" %></span><span>赞</span></p>