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

app/controllers/users/recent_contacts_controller.rb

@@ -3,6 +3,6 @@ class Users::RecentContactsController < Users::BaseController
 
   def index
     contacts  = observed_user.recent_contacts.distinct
-    @contacts = contacts.order('private_messages.created_at DESC').limit(10).includes(:user_extension)
+    @contacts = contacts.where(laboratory_id: current_laboratory.id).order('private_messages.created_at DESC').limit(10).includes(:user_extension)
   end
 end