@ -132,7 +132,7 @@ class UsersController < ApplicationController
# 未读的消息存放在数组
mess = message_all . message
if ( message_all . message_type != " SystemMessage " && ! mess . nil? && ( mess . viewed == 0 || ! mess . viewed ) ) || ( message_all . message_type == " SystemMessage " && ! mess . nil? && mess . created_at > onclick_time )
unless ( message_all . message_type == 'CourseMessage' && mess && mess . course . is_delete == 1 )
unless ( message_all . message_type == 'CourseMessage' && mess && mess . course && mess . course . is_delete == 1 )
@message_alls << mess
end
break if @message_alls . length == 5
@ -166,7 +166,7 @@ class UsersController < ApplicationController
messages = MessageAll . where ( " (user_id =? and message_type !=?) or message_type =? " , @user . id , " SystemMessage " , " SystemMessage " ) . includes ( :message ) . order ( " created_at desc " )
messages . each do | message_all |
mess = message_all . message
unless ( message_all . message_type == 'CourseMessage' && mess && mess . course . is_delete == 1 )
unless ( message_all . message_type == 'CourseMessage' && mess && mess . course && mess . course . is_delete == 1 )
@message_alls << mess
end
end
@ -177,7 +177,7 @@ class UsersController < ApplicationController
# 在点击或者刷新消息列表后未读的消息存放在数组
mess = message_all . message
if message_all . message_type != " SystemMessage " && ! mess . nil? && ( mess . viewed == 0 || ! mess . viewed )
unless ( message_all . message_type == 'CourseMessage' && mess && mess . course . is_delete == 1 )
unless ( message_all . message_type == 'CourseMessage' && mess && mess . course && mess . course . is_delete == 1 )
@message_alls << mess
end
end