Merge remote-tracking branch 'origin/szzh' into szzh

app/helpers/activities_helper.rb

@@ -57,7 +57,7 @@ module ActivitiesHelper
     end
     #留言
     if activity.act_type == 'JournalsForMessage'
-      return [activity.act.jour_type,activity.act.jour_id]
+      return [activity.act.jour_type,activity.act.jour_id,activity.act.user_id]
     end
 
     # HomeworkCommon Issue Journal Message News

app/models/activity.rb

@@ -14,8 +14,11 @@ class Activity < ActiveRecord::Base
   #helper :activities
   include ActivitiesHelper
   def set_container_type_val
-    container_type,container_id =get_container_type(self)
+    params =get_container_type(self)
-    self.activity_container_type = container_type
+    self.activity_container_type = params[0]
-    self.activity_container_id = container_id
+    self.activity_container_id = params[1]
+    if(self.act_type == 'JournalsForMessage')
+      self.user_id = params[2]
+    end
   end
 end