diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb
index ed2b2ebfa..a46e6e555 100644
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@@ -86,7 +86,16 @@ class FilesController < ApplicationController
       else
         @result = find_course_attache q,@course,sort
         @result = visable_attachemnts @result
-        @searched_attach = paginateHelper @result,10
+
+        @all_attachments = @result
+        @limit = 10
+        @feedback_count = @all_attachments.count
+        @feedback_pages = Paginator.new @feedback_count, @limit, params['page']
+        @offset ||= @feedback_pages.offset
+        #@curse_attachments_all = @all_attachments[@offset, @limit]
+        @obj_attachments = paginateHelper @all_attachments,10
+
+        # @searched_attach = paginateHelper @result,10
 
         @tag_list = get_course_tag_list @course
       end
@@ -867,7 +876,17 @@ class FilesController < ApplicationController
     else
       @result = @result.select{|attachment| attachment.tag_list.include?(@tag_name)} unless @tag_name.blank?
     end
-    @searched_attach = paginateHelper @result,10
+
+    @all_attachments = @result
+    @limit = 10
+    @feedback_count = @all_attachments.count
+    @feedback_pages = Paginator.new @feedback_count, @limit, params['page']
+    @offset ||= @feedback_pages.offset
+    #@curse_attachments_all = @all_attachments[@offset, @limit]
+    @obj_attachments = paginateHelper @all_attachments,10
+
+
+    # @searched_attach = paginateHelper @result,10
     if @project
       @tag_list = get_project_tag_list @project
       @result_search_project = @result
diff --git a/app/views/files/_course_list.html.erb b/app/views/files/_course_list.html.erb
index 7724bb861..be7da4732 100644
--- a/app/views/files/_course_list.html.erb
+++ b/app/views/files/_course_list.html.erb
@@ -1,19 +1,14 @@
-  <% curse_attachments.each do |file| %>
-      <% if file.is_public? || User.current.member_of_course?(course) || User.current.admin? %>
+<% curse_attachments.each do |file| %>
+    <% if file.is_public? || User.current.member_of_course?(course) || User.current.admin? %>
         <div id="resource_detail_<%=file.id %>">
-            <%=render :partial=>'files/resource_detail',:locals => {:file => file} %>
+          <%=render :partial=>'files/resource_detail',:locals => {:file => file} %>
         </div>
-      <% else %>
-          <div class="re_con_box"><span class='fr mr10 pr_join_span '><%= file.filename %>是私有资源</span></div>
-      <% end %>
-  <% end %>
-
-<% if curse_attachments.count == 10%>
-    <% if params[:action] == 'search' %>
-        <%=link_to "点击展开更多",  search_course_files_path({:course_id => course.id,:page => @obj_pages.nil? ? @feedback_pages.page + 1 : @obj_pages.page + 1}.merge(params)),:id => "show_more_attachments",:remote => "true",:class => "loadMore mt10 f_grey" %>
     <% else %>
-    <!-- 全站搜索的时候 返回的页码对象是obj_pages,而站内搜索返回的页码对象是feedback_pages -->
-        <%=link_to "点击展开更多",  course_files_path(:course_id => course.id, :page => @page), :id => "show_more_attachments",:remote => "true",:class => "loadMore mt10 f_grey" %>
-    <%end%>
-<% end%>
+        <div class="re_con_box"><span class='fr mr10 pr_join_span '><%= file.filename %>是私有资源</span></div>
+    <% end %>
+<% end %>
+
+<ul class="wlist">
+  <%= pagination_links_full @feedback_pages, @feedback_count, :per_page_links => false, :remote => true, :flag => true%>
+</ul>
 
diff --git a/app/views/files/index.js.erb b/app/views/files/index.js.erb
index 49e7ac714..134598bf7 100644
--- a/app/views/files/index.js.erb
+++ b/app/views/files/index.js.erb
@@ -1,5 +1,6 @@
 <% if @course %>
-    $("#show_more_attachments").replaceWith("<%= escape_javascript( render :partial => 'files/course_list',:locals => {course:@course,all_attachments: @all_attachments,sort:@sort,order:@order,curse_attachments:@obj_attachments}   )%>");
+    $("#resource_list").html("<%= escape_javascript( render :partial => 'files/course_file',:locals => {course:@course,all_attachments: @all_attachments,sort:@sort,order:@order,curse_attachments:@obj_attachments}   )%>");
+    $("#pages").html('<%= pagination_links_full @feedback_pages, @feedback_count, :per_page_links => false, :remote => true, :flag => true %>');
 <% elsif @project %>
     $("#show_more_attachments").replaceWith("<%= escape_javascript( render :partial => 'files/project_list', :locals => {project:@project, all_attachments:@all_attachments, sort:@sort, order:@order, project_attachments:@obj_attachments})%>");
 <% elsif @org_subfield %>
diff --git a/app/views/files/search.js.erb b/app/views/files/search.js.erb
index fd88b3f9e..6cfe0f673 100644
--- a/app/views/files/search.js.erb
+++ b/app/views/files/search.js.erb
@@ -1,6 +1,6 @@
 <% if (@obj_pages &&( @obj_pages.page > 1)) || (@feedback_pages && (@feedback_pages.page > 1)) %> //搜索的时候有时候是需要加载下一页，有时候是直接替换当前 #course_list。这个根据 page来判定
     $("#show_more_attachments").replaceWith("<%= escape_javascript( render :partial => 'files/course_list',:locals => {course: @course,all_attachments:  @result,sort:@sort,order:@order,curse_attachments:@searched_attach}   )%>");
 <% else %>
-    $("#course_list").html("<%= escape_javascript(render :partial => 'files/course_list',:locals => {course: @course,all_attachments: @result,sort:@sort,order:@order,curse_attachments:@searched_attach})%>");
-    $("#attachment_count").html("<%= @result.count%>")
+    $("#resource_list").html("<%= escape_javascript( render :partial => 'files/course_file',:locals => {course:@course,all_attachments: @all_attachments,sort:@sort,order:@order,curse_attachments:@obj_attachments}   )%>");
+    $("#pages").html('<%= pagination_links_full @feedback_pages, @feedback_count, :per_page_links => false, :remote => true, :flag => true %>');
 <% end %>
\ No newline at end of file
diff --git a/app/views/files/search_tag_attachment.js.erb b/app/views/files/search_tag_attachment.js.erb
index 3003d8b98..8d2b29fe9 100644
--- a/app/views/files/search_tag_attachment.js.erb
+++ b/app/views/files/search_tag_attachment.js.erb
@@ -1,7 +1,6 @@
 <% if @course %>
-    $("#course_list").html("<%= escape_javascript(render :partial => 'course_list',:locals => {course: @course,all_attachments: @result,sort:@sort,order:@order,curse_attachments:@searched_attach})%>");
-    $("#course_filter_order").html("<%= escape_javascript(render :partial => 'course_file_filter_order', :locals => {course: @course,all_attachments: @result,sort:@sort,order:@order,curse_attachments:@searched_attach, tag_name: @tag_name, q: @q})%>");
-    $("#attachment_count").html("<%= @result.count%>")
+    $("#resource_list").html("<%= escape_javascript( render :partial => 'files/course_file',:locals => {course:@course,all_attachments: @all_attachments,sort:@sort,order:@order,curse_attachments:@obj_attachments}   )%>");
+    $("#pages").html('<%= pagination_links_full @feedback_pages, @feedback_count, :per_page_links => false, :remote => true, :flag => true %>');
 <% else %>
     $("#course_list").html("<%= escape_javascript(render :partial => 'project_list',:locals => {project:@project, all_attachments:@result_search_project, sort:@sort, order:@order, project_attachments:@searched_attach}) %>");
     $("#attachment_count").html("<%= @result_search_project.count%>")