diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 335604205..f5684f202 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -569,12 +569,12 @@ class UsersController < ApplicationController
     @order,@b_sort = params[:order] || "created_at",params[:sort] || "desc"
     @user = User.current
     @r_sort = @b_sort == "desc" ? "asc" : "desc"
-    if(params[:type].blank? || params[:type] == "1") #题库
+    if(params[:type].blank? || params[:type] == "1") #我的题库
+      @homeworks = HomeworkCommon.where("user_id = #{@user.id} and publish_time <= '#{Date.today}'").order("#{@order} #{@b_sort}")
+    elsif params[:type] == "2" #题库
       visible_course = Course.where("is_delete = 0")
       visible_course_ids = visible_course.empty? ? "(-1)" : "(" + visible_course.map{|course| course.id}.join(",") + ")"
       @homeworks = HomeworkCommon.where("course_id in #{visible_course_ids} and publish_time <= '#{Date.today}'").order("#{@order} #{@b_sort}")
-    elsif params[:type] == "2" #我的题库
-      @homeworks = HomeworkCommon.where("user_id = #{@user.id} and publish_time <= '#{Date.today}'").order("#{@order} #{@b_sort}")
     end
     @type = params[:type]
     @limit = 25
@@ -728,7 +728,11 @@ class UsersController < ApplicationController
     @order,@b_sort = params[:order] || "created_at",params[:sort] || "desc"
     @r_sort = @b_sort == "desc" ? "asc" : "desc"
     @user = User.current
-    if(params[:type].blank? || params[:type] == "1") #题库
+    if(params[:type].blank? || params[:type] == "1") #我的题库
+      courses = @user.courses.where("is_delete = 1")
+      course_ids = courses.empty? ? "(-1)" : "(" + courses.map{|course| course.id}.join(",") + ")"
+      @homeworks = HomeworkCommon.where("user_id = #{@user.id} and publish_time <= '#{Date.today}' and course_id not in #{course_ids}").order("#{@order} #{@b_sort}")
+    elsif params[:type] == "2" #题库
       if params[:is_import].to_i == 1
         visible_course = Course.where("is_public = 1 && is_delete = 0")
       elsif params[:is_import].to_i == 0
@@ -736,10 +740,6 @@ class UsersController < ApplicationController
       end
       visible_course_ids = visible_course.empty? ? "(-1)" : "(" + visible_course.map{|course| course.id}.join(",") + ")"
       @homeworks = HomeworkCommon.where("course_id in #{visible_course_ids} and publish_time <= '#{Date.today}'").order("#{@order} #{@b_sort}")
-    elsif params[:type] == "2" #我的题库
-      courses = @user.courses.where("is_delete = 1")
-      course_ids = courses.empty? ? "(-1)" : "(" + courses.map{|course| course.id}.join(",") + ")"
-      @homeworks = HomeworkCommon.where("user_id = #{@user.id} and publish_time <= '#{Date.today}' and course_id not in #{course_ids}").order("#{@order} #{@b_sort}")
     elsif params[:type] == "3" #申请题库
       none_visible_course = Course.where("is_delete = 1")
       none_visible_course_ids = none_visible_course.empty? ? "(-1)" : "(" + none_visible_course.map{|course| course.id}.join(",") + ")"
@@ -806,7 +806,18 @@ class UsersController < ApplicationController
     @user = User.current
     search = params[:name].to_s.strip.downcase
     type_ids = params[:property]=="" || params[:property].nil? ? "(1, 2, 3)" : "(" + params[:property] + ")"
-    if(params[:type].blank? || params[:type] == "1") #全部
+    if(params[:type].blank? || params[:type] == "1") #我的题库
+      courses = @user.courses.where("is_delete = 1")
+      course_ids = courses.empty? ? "(-1)" : "(" + courses.map{|course| course.id}.join(",") + ")"
+      if @order == "course_name"
+        sql = "SELECT homework_commons.* FROM homework_commons INNER JOIN courses ON homework_commons.course_id = courses.id where homework_commons.course_id not in #{course_ids} and homework_commons.user_id = #{@user.id} and homework_type in #{type_ids} and publish_time <= '#{Date.today}' and (homework_commons.name like '%#{search}%') order by CONVERT (courses.name USING gbk) COLLATE gbk_chinese_ci #{@b_sort}"
+        @homeworks = HomeworkCommon.find_by_sql(sql)
+      elsif @order == "user_name"
+        @homeworks = HomeworkCommon.where("user_id = #{@user.id} and course_id not in #{course_ids} and publish_time <= '#{Date.today}' and (name like '%#{search}%') and homework_type in #{type_ids}").joins(:user).order("CONVERT (lastname USING gbk) COLLATE gbk_chinese_ci #{@b_sort}, CONVERT (firstname USING gbk) COLLATE gbk_chinese_ci #{@b_sort},login #{@b_sort}")
+      else
+        @homeworks = HomeworkCommon.where("user_id = #{@user.id} and course_id not in #{course_ids} and publish_time <= '#{Date.today}' and (name like '%#{search}%') and homework_type in #{type_ids}").order("#{@order} #{@b_sort}")
+      end
+    elsif params[:type] == "2" #题库
       if params[:is_import].to_i == 1
         visible_course = Course.where("is_public = 1 && is_delete = 0")
       elsif params[:is_import].to_i == 0
@@ -825,17 +836,6 @@ class UsersController < ApplicationController
       else
         @homeworks = HomeworkCommon.where("course_id in #{visible_course_ids} and publish_time <= '#{Date.today}' and homework_type in #{type_ids} and (name like '%#{search}%' or user_id in #{user_ids})").order("#{@order} #{@b_sort}")
       end
-    elsif params[:type] == "2" #我的题库
-      courses = @user.courses.where("is_delete = 1")
-      course_ids = courses.empty? ? "(-1)" : "(" + courses.map{|course| course.id}.join(",") + ")"
-      if @order == "course_name"
-        sql = "SELECT homework_commons.* FROM homework_commons INNER JOIN courses ON homework_commons.course_id = courses.id where homework_commons.course_id not in #{course_ids} and homework_commons.user_id = #{@user.id} and homework_type in #{type_ids} and publish_time <= '#{Date.today}' and (homework_commons.name like '%#{search}%') order by CONVERT (courses.name USING gbk) COLLATE gbk_chinese_ci #{@b_sort}"
-        @homeworks = HomeworkCommon.find_by_sql(sql)
-      elsif @order == "user_name"
-        @homeworks = HomeworkCommon.where("user_id = #{@user.id} and course_id not in #{course_ids} and publish_time <= '#{Date.today}' and (name like '%#{search}%') and homework_type in #{type_ids}").joins(:user).order("CONVERT (lastname USING gbk) COLLATE gbk_chinese_ci #{@b_sort}, CONVERT (firstname USING gbk) COLLATE gbk_chinese_ci #{@b_sort},login #{@b_sort}")
-      else
-        @homeworks = HomeworkCommon.where("user_id = #{@user.id} and course_id not in #{course_ids} and publish_time <= '#{Date.today}' and (name like '%#{search}%') and homework_type in #{type_ids}").order("#{@order} #{@b_sort}")
-      end
     elsif params[:type] == "3" #申请题库
       apply_homeworks = ApplyHomework.where("user_id = ?",@user.id)
       homework_ids = apply_homeworks.empty? ? "(-1)" : "(" + apply_homeworks.map{|ah| ah.homework_common_id}.join(",") + ")"
diff --git a/app/views/users/user_homeworks.html.erb b/app/views/users/user_homeworks.html.erb
index 6197aa9c4..6016f4101 100644
--- a/app/views/users/user_homeworks.html.erb
+++ b/app/views/users/user_homeworks.html.erb
@@ -39,10 +39,10 @@
     <div class="resource-wrapper mb10">
         <ul class="resource-banner">
           <li class="fl resource-switch">
-            <a href="<%= user_homework_type_user_path(@user,:is_import => 0) %>" id="public_homeworks_choose" class="resource-tab resource-tab-active" data-remote="true">题库</a>
+            <a href="<%= user_homework_type_user_path(@user,:is_import => 0) %>" id="public_homeworks_choose" class="resource-tab resource-tab-active" data-remote="true">我的题库</a>
           </li>
           <li class="fl resource-switch">
-            <a href="<%= user_homework_type_user_path(@user,:type=>'2',:is_import => 0) %>" id="user_homeworks_choose" class="resource-tab" data-remote="true">我的题库</a>
+            <a href="<%= user_homework_type_user_path(@user,:type=>'2',:is_import => 0) %>" id="user_homeworks_choose" class="resource-tab" style="text-align: center;" data-remote="true">题库</a>
           </li>
           <li class="fl resource-switch">
             <a href="<%= user_homework_type_user_path(@user,:type=>'3',:is_import => 0) %>" id="apply_homeworks_choose" class="resource-tab" data-remote="true">申请题库</a>