diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index ae0b4d7c9..7e44174fe 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -112,17 +112,10 @@ class UsersController < ApplicationController
     case params[:type]
       when nil
         @message_alls = []
-        system_message_types = MessageAll.where("message_type =?", "SystemMessage").order("created_at desc")
-        messages = MessageAll.where("user_id =? and message_type !=?" ,@user, "SystemMessage").order("created_at desc")
+        messages = MessageAll.where("(user_id =? and message_type !=?) or message_type =?" ,@user, "SystemMessage", "SystemMessage").order("created_at desc")
         messages.each do |message_all|
           @message_alls << message_all.message
         end
-        # 系统消息需要给每个人发送，之所以这样做，可以避免遍历系统所有用户
-        system_message_types.each do |system_message_type|
-          @message_alls << system_message_type.message
-        end
-        # 取出所有符合条件的按照创建时间排序
-        @message_alls = @message_alls.sort {|a,b| b.created_at <=> a.created_at}
       when 'unviewed'
         @message_alls = []
         messages = MessageAll.where("user_id =?", @user).order("created_at desc")
diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb
index a95645571..fee28f761 100644
--- a/app/views/users/_user_message_course.html.erb
+++ b/app/views/users/_user_message_course.html.erb
@@ -191,8 +191,10 @@
           <div style="display: none" class="message_title_red system_message_style">
             <p>
               <%= User.current.lastname + User.current.firstname %><%= User.current.allowed_to?(:as_teacher, ma.course_message.course) ? '老师':'同学'%>您好！
-              <%= User.current.eql?(ma.course_message.user) ?"您":(ma.course_message.user.lastname + ma.course_message.user.firstname + "老师") %>启动作业匿评失败，作业详情如下：
+              <%= User.current.eql?(ma.course_message.user) ?"您":(ma.course_message.user.lastname + ma.course_message.user.firstname + "老师") %>启动作业匿评失败，
+              失败原因：提交作品的人数低于2人
             </p>
+            <p>作业详情如下：</p>
             <p>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.term %>)</p>
             <p>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></p>
           </div>