diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
index b36ef592d..e052ec20f 100644
--- a/app/controllers/organizations_controller.rb
+++ b/app/controllers/organizations_controller.rb
@@ -642,4 +642,12 @@ class OrganizationsController < ApplicationController
       OrgMessage.create(:user_id => params[:user_id], :organization_id => @organization.id, :message_type => 'AgreeApplySubdomain', :message_id => @organization.id, :sender_id => User.current.id, :viewed => 0, :content => params[:org_domain])
     end
   end
+
+  def org_member_autocomplete
+    @org = Organization.find(params[:org])
+    @flag = params[:flag] || false
+    respond_to do |format|
+      format.js
+    end
+  end
 end
diff --git a/app/views/organizations/org_member_autocomplete.js.erb b/app/views/organizations/org_member_autocomplete.js.erb
new file mode 100644
index 000000000..1dbb972f8
--- /dev/null
+++ b/app/views/organizations/org_member_autocomplete.js.erb
@@ -0,0 +1,23 @@
+<% if @org%>
+var checked = $("#principals_for_new_member input:checked").size();
+if(checked > 0)
+{
+    alert('翻页或搜索后将丢失当前选择的用户数据!');
+}
+<% if @flag == "true"%>
+$('#principals_for_new_member').html('<%= escape_javascript(find_user_not_in_current_org_by_name(@org)) %>');
+<% else%>
+$('#principals_for_new_member').html('<%= escape_javascript(find_user_not_in_current_org_by_name(@org)) %>');
+<% end%>
+
+<%end%>
+var collection=$("#principals_for_new_member").children("#principals").children("label");
+collection.css("text-overflow","ellipsis");
+collection.css("white-space","nowrap");
+collection.css("width","200px");
+collection.css("overflow","hidden");
+for(i=0;i<collection.length;i++){    //增加悬浮显示
+    var label=collection[i];
+    var text=$(label).text();
+    $(label).attr("title",text);
+}
\ No newline at end of file
diff --git a/app/views/organizations/setting.html.erb b/app/views/organizations/setting.html.erb
index 3a5a8c175..edf00cd78 100644
--- a/app/views/organizations/setting.html.erb
+++ b/app/views/organizations/setting.html.erb
@@ -112,7 +112,8 @@
             <%= form_tag url_for(:controller => 'org_member', :action => 'create', :org => @organization),:id=>'org_member_add_form',:remote=>true do |f|%>
                 <input type="text" id="not_org_member_search" name="orgAddSearch" placeholder="支持姓名、邮箱、登录名搜索" class="orgAddSearch mb20" />
                 <%# if @organization.secdomain_name.nil? %>
-                    <%= javascript_tag "observeSearchfield('not_org_member_search', null, '#{ escape_javascript  "/org_member/org_member_autocomplete?" + {:org=> @organization.id}.to_query }')" %>
+                    <%#= javascript_tag "observeSearchfield('not_org_member_search', null, '#{ escape_javascript  host_with_protocol + "/org_member/org_member_autocomplete?" + {:org=> @organization.id}.to_query }')" %>
+                    <%= javascript_tag "observeSearchfield('not_org_member_search', null, '#{url_for(:controller => 'organizations', :action => 'org_member_autocomplete', :org=> @organization.id)}')" %>
                 <%# else %>
                     <%#= javascript_tag "observeSearchfield('not_org_member_search', null, '#{ escape_javascript  secdomain_with_protocol(@organization.secdomain_name) + "/org_member/org_member_autocomplete?" + {:org=> @organization.id}.to_query }')" %>
                 <%# end %>
diff --git a/config/routes.rb b/config/routes.rb
index ec8fa2337..7008b3ab7 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -104,6 +104,7 @@ RedmineApp::Application.routes.draw do
       post 'agree_apply_subdomain'
       post 'update_field_by_admin'
       post 'reset_update_field_by_admin'
+      get 'org_member_autocomplete'
     end
   end