diff --git a/app/helpers/welcome_helper.rb b/app/helpers/welcome_helper.rb
index 8ee7f42d8..48d590c4b 100644
--- a/app/helpers/welcome_helper.rb
+++ b/app/helpers/welcome_helper.rb
@@ -231,12 +231,12 @@ module WelcomeHelper
   # modif by nwb
   def find_all_new_hot_course limit = 9 ,school_id = 0
     #sort_project_by_hot_rails 1, 'course_ac_para DESC', limit
-    time_now = Time.new.strftime("%Y");
+    time_now = Time.new.strftime("%Y")
     if school_id
-    courses = Course.visible.joins(:course_status).where("#{Course.table_name}.created_at like '%#{time_now}%' and #{Course.table_name}.school_id <>
+    courses = Course.includes(:school, :members).visible.joins(:course_status).where("#{Course.table_name}.created_at like '%#{time_now}%' and #{Course.table_name}.school_id <>
        ?", school_id).order("course_ac_para DESC").limit(limit).all
     else
-      courses = Course.visible.joins(:course_status).where("#{Course.table_name}.created_at like '%#{time_now}%' and #{Course.table_name}.school_id is not NULL
+      courses = Course.includes(:school, :members).visible.joins(:course_status).where("#{Course.table_name}.created_at like '%#{time_now}%' and #{Course.table_name}.school_id is not NULL
        ").order("course_ac_para DESC").limit(limit).all
      end
     courses
diff --git a/app/views/welcome/_course_list.html.erb b/app/views/welcome/_course_list.html.erb
new file mode 100644
index 000000000..f590cf868
--- /dev/null
+++ b/app/views/welcome/_course_list.html.erb
@@ -0,0 +1,28 @@
+<% course_list.map do |course| %>
+    <li class='<%= cycle("odd", "even") %>' title=<%= course.description.to_s.gsub(/<\/?.*?>/,"") %>>
+      <div class='avatar'>
+        <%= image_tag(get_course_avatar(course), :class => "avatar-4") %>
+      </div>
+      <!-- 上左下右 -->
+      <div class='desc_item'>
+                    <span class=''>
+                      <% if (course.school == nil) %>
+                        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                        <% else %>
+                        <%= link_to course.school.name.try(:gsub, /(.+)$/, '\1:'), options={:action => 'course', :school_id => course.school.id}, html_options={:method => 'get'} %>
+                        <% end %>
+                    </span>
+                    <span class='font_bolder'>
+                        <%= link_to(course.try(:teacher).try(:realname), user_path(course.teacher)) %>
+                      <%#=course.try(:teacher).try(:name)%>
+                    </span>
+      </div>
+      <div class='desc_item text_nowrap'>
+        [<%= get_course_term course %>]
+        <%= link_to(course.name.truncate(30, omission: '...'), course_path(course.id), :class => "d-g-blue d-p-project-name", :title => "#{course.name}") %>
+        (<%= course.members.count %>人)
+        <%# files_count = course.attachments.count.to_s %>
+        (<%= link_to "#{course.attachments.count.to_s}份", course_files_path(course) %>资料)
+      </div>
+    </li>
+<% end %>
diff --git a/app/views/welcome/_no_course_title.html.erb b/app/views/welcome/_no_course_title.html.erb
new file mode 100644
index 000000000..f16b91dba
--- /dev/null
+++ b/app/views/welcome/_no_course_title.html.erb
@@ -0,0 +1,5 @@
+<h1></h1>
+<p id="errorExplanation">
+  <%= course_title%>
+</p>
+<h1></h1>
\ No newline at end of file
diff --git a/app/views/welcome/course.html.erb b/app/views/welcome/course.html.erb
index 7cab331b6..c979807b9 100644
--- a/app/views/welcome/course.html.erb
+++ b/app/views/welcome/course.html.erb
@@ -88,46 +88,15 @@
       <span><%= link_to "更多>>", {:controller => 'courses', :action => 'index', :school_id => nil} %></span>
 
       <div class="d-p-projectlist-box">
-        <ul class="d-p-projectlist">
-
-        </ul>
         <ul class="d-p-projectlist">
 
           <% if User.current.logged? %>
-              <h1></h1>
-              <p id="errorExplanation">
-                该学校未开设任何课程，您可以查看其他学校课程
-              </p>
-              <h1></h1>
-          <% end %>
-
-          <% find_all_new_hot_course(9, @school_id).map do |course| %>
-              <li class='<%= cycle("odd", "even") %>' title=<%= course.description.to_s.gsub(/<\/?.*?>/,"") %>>
-                <div class='avatar'>
-                  <%= image_tag(get_course_avatar(course), :class => "avatar-4") %>
-                </div>
-                <!-- 上左下右 -->
-                <div class='desc_item'>
-                    <span class=''>
-                      <% if (course.school == nil) %>
-                        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                        <% else %>
-                        <%= link_to course.school.name.try(:gsub, /(.+)$/, '\1:'), options={:action => 'course', :school_id => course.school.id}, html_options={:method => 'get'} %>
-                        <% end %>
-                    </span>
-                    <span class='font_bolder'>
-                        <%= link_to(course.try(:teacher).try(:realname), user_path(course.teacher)) %>
-                      <%#=course.try(:teacher).try(:name)%>
-                    </span>
-                </div>
-                <div class='desc_item text_nowrap'>
-                  [<%= get_course_term course %>]
-                  <%= link_to(course.name.truncate(30, omission: '...'), course_path(course.id), :class => "d-g-blue d-p-project-name", :title => "#{course.name}") %>
-                  (<%= "#{memberCount(course)}人" %>)
-                  <% files_count = course.attachments.count.to_s %>
-                  (<%= link_to "#{files_count}份", course_files_path(course) %>资料)
-                </div>
+              <li>
+                <%= render :partial => 'no_course_title', :locals => {:course_title => l(:lable_school_no_course)} %>
               </li>
+              <%= render :partial => 'course_list', :locals => {:course_list => find_all_new_hot_course(9, @school_id)} %>
+          <% else %>
+              <%= render :partial => 'course_list', :locals => {:course_list => find_all_new_hot_course(10, @school_id)} %>
           <% end %>
         </ul>
       </div>
@@ -143,80 +112,12 @@
       <% end %>
       <div class="d-p-projectlist-box">
         <ul class="d-p-projectlist">
-
-        </ul>
-        <ul class="d-p-projectlist">
-          <% school_course.map do |course| %>
-              <% if course.school%>
-              <li class='<%= cycle("odd", "even") %>' title=<%= course.description.to_s.gsub(/<\/?.*?>/,"") %>>
-                <div class='avatar'>
-                  <%= image_tag(get_course_avatar(course), :class => "avatar-4") %>
-                </div>
-                <!-- 上左下右 -->
-                <div class='desc_item'>
-                <span class=''>
-                  <%= link_to course.school.name.try(:gsub, /(.+)$/, '\1:'), options={:action => 'course', :school_id => course.school.id}, html_options={:method => 'get'} %>
-                </span>
-                <span class='font_bolder'>
-                <%= link_to(course.try(:teacher).try(:realname), user_path(course.teacher)) %>
-                </span>
-                </div>
-                <div class='desc_item text_nowrap'>
-                  [<%= get_course_term course %>]
-                  <%= link_to(course.name.truncate(30, omission: '...'), course_path(course.id), :class => "d-g-blue d-p-project-name", :title => "#{course.name}") %>
-                  (<%= "#{memberCount(course)}人" %>)
-                  <% files_count = course.attachments.count.to_s %>
-                  (<%= link_to "#{files_count}份", course_files_path(course) %>资料)
-                </div>
-
-                <!--
-                 <div class='join_course_link'>
-                  <%# if !course_endTime_timeout?(course) %>
-                      <div>
-                        <%#= join_in_course(course, User.current) %>
-                      </div>
-                  <%# end %>
-                </div>
-                -->
-              </li>
-                  <%end%>
-          <% end; reset_cycle %>
+          <%= render :partial => 'course_list', :locals => {:course_list => school_course} %>
           <% if school_course.count < 10 %>
               <li>
-                <h1></h1>
-
-                <p id="errorExplanation">
-                  该学校开设课程较少，您可以查看其他学校课程
-                </p>
+                <%= render :partial => 'no_course_title', :locals => {:course_title => l(:lable_school_less_course)} %>
               </li>
-              <% find_all_new_hot_course(10 - school_course.count, @school_id).map do |course| %>
-                  <li class='<%= cycle("odd", "even") %>' title=<%= course.description.to_s.gsub(/<\/?.*?>/,"") %>>
-                    <div class='avatar'>
-                      <%= image_tag(get_course_avatar(course), :class => "avatar-4") %>
-                    </div>
-                    <!-- 上左下右 -->
-                    <div class='desc_item'>
-                <span class=''>
-                  <% if (course.school == nil) %>
-                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                    <% else %>
-                      <!-- modified by zjc  添加超链接 -->
-                      <%= link_to course.school.name.try(:gsub, /(.+)$/, '\1:'), options={:action => 'course', :school_id => course.school.id}, html_options={:method => 'get'} %>
-                    <% end %>
-                </span>
-                <span class='font_bolder'>
-                    <%= link_to(course.try(:teacher).try(:name), user_path(course.teacher)) %>
-                </span>
-                    </div>
-                    <div class='desc_item text_nowrap'>
-                      [<%= get_course_term course %>]
-                      <%= link_to(course.name.truncate(30, omission: '...'), course_path(course.id), :class => "d-g-blue d-p-project-name", :title => "#{course.name}") %>
-                      (<%= "#{memberCount(course)}人" %> )
-                      <% files_count = course.attachments.count.to_i.to_s %>
-                      (<%= link_to "#{files_count}份", course_files_path(course) %>资料)
-                    </div>
-                  </li>
-              <% end %>
+              <%= render :partial => 'course_list', :locals => {:course_list => find_all_new_hot_course(9 - school_course.count, @school_id)} %>
           <% end %>
         </ul>
       </div>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 9b6329b95..135e9afb1 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -2101,4 +2101,7 @@ zh:
   # ajax异步验证
   modal_valid_passing: 可以使用
   label_bug: 漏洞
+
+  lable_school_no_course: 该学校未开设任何课程，您可以查看其他学校课程
+  lable_school_less_course: 该学校开设课程较少，您可以查看其他学校课程
   
\ No newline at end of file