Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

app/controllers/users_for_private_messages_controller.rb

@@ -2,7 +2,7 @@ class UsersForPrivateMessagesController < ApplicationController
   before_action :require_login, :check_auth
 
   def index
-    users = User.active.where.not(id: current_user.id)
+    users = User.active.where.not(id: current_user.id).where(laboratory_id: current_laboratory.id)
 
     keyword = params[:keyword].to_s.strip
     if keyword.blank?