diff --git a/app/helpers/files_helper.rb b/app/helpers/files_helper.rb
index 6b748649b..238999a71 100644
--- a/app/helpers/files_helper.rb
+++ b/app/helpers/files_helper.rb
@@ -126,7 +126,7 @@ module FilesHelper
           (attachment.container_type == "Course" && User.current.allowed_to?(:as_teacher,Course.find(attachment.container_id)))||
           (attachment.container_type == "Course" && User.current.member_of_course?(Course.find(attachment.container_id)) && attachment.is_publish == 1)||
           attachment.author_id == User.current.id ||
-          attachment.container_type == "OrgSubfield"
+          (attachment.container_type == "OrgSubfield" and User.current.member_of_org?(attachment.container.organization))
         result << attachment
       end
     end
diff --git a/app/views/files/_org_subfield_list.html.erb b/app/views/files/_org_subfield_list.html.erb
index 641029bf2..90ae3516d 100644
--- a/app/views/files/_org_subfield_list.html.erb
+++ b/app/views/files/_org_subfield_list.html.erb
@@ -1,70 +1,72 @@
 <% delete_allowed = User.current.admin? %>
 
 <% org_subfield_attachments.each do |file| %>
-  <div class="resources mt10" id="container_files_<%= file.id %>">
-    <div class="homepagePostBrief">
-      <div class="homepagePostPortrait">
-        <%= link_to image_tag(url_to_avatar(file.author), :width => 50, :height => 50), user_path(file.author) %>
-      </div>
-      <div class="homepagePostDes">
-        <div class="homepagePostTitle break_word mt-4">
-          <%= link_to file.is_public? ? truncate(file.filename, length: 70) : truncate(file.filename,length: 50, omission: '...'),
-                      download_named_attachment_path(file.id, file.filename),
-                      :title => file.filename+"\n"+file.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;",:class => "linkGrey3 f_14 f_l"  %>
-          <%= file_preview_eye(file, class: 'preview') %>
-          <span id="image_private_<%= file.id%>">
-            <% if file.is_public? == false%>
-               <span class="img_private ml5">私有</span>
-            <%end %>
-          </span>
-          <br/>
-        </div>
-        <div class="mt5">
-          <span class="fontGrey2 mr15 fl">上传时间：<%= format_date(file.created_on)%></span>
-          <% if file.tag_list.length > 0%>
-              <span class="fontGrey2 fl mr15">上传类型：<%= file.tag_list[0] %></span>
-          <% end %>
-          <p class="f_l mb5 fontGrey2">文件大小：<%= number_to_human_size(file.filesize) %></p>
-          <p class="fl ml15 fontGrey2">下载<%= file.downloads%>&nbsp;&nbsp;|&nbsp;&nbsp;引用<span id="reference_number_<%= file.id %>"><%= file.quotes.nil? ? 0:file.quotes  %></span></p>
-        </div>
-        <div class="cl"></div>
-        <div class="tag_h">
-          <%= render :partial => 'tags/tag_new', :locals => {:obj => file, :object_flag => "6"} %>
-          <%= render :partial => 'tags/tag_add', :locals => {:obj => file, :object_flag => "6"} %>
-        </div>
-        <div class="homepagePostSetting">
-          <ul>
-            <li class="homepagePostSettingIcon">
-              <% if User.current.logged? %>
-                 <% if (delete_allowed || User.current.id == file.author_id) && file.container_id == org_subfield.id && file.container_type == "OrgSubfield"  %>
-                    <ul class="homepagePostSettiongText">
-                      <li><%= link_to("发&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;送".html_safe, 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{file.id}','#{User.current.id}','file')")  %></li>
-                        <li><%= link_to '更新版本',attachments_versions_path(file),:class => "postOptionLink",:remote=>true %></li>
-                        <li>
-                          <span id="is_public_<%= file.id %>">
-                            <%= link_to (file.is_public? ? "设为私有":"设为公开"), update_file_dense_attachments_path(:attachmentid=>file.id,:newtype=>(file.is_public? ? 0:1)),:remote=>true,:class=>"postOptionLink",:method => :post  %>
-                          </span>
-                        </li>
-                        <li>
-                          <%= link_to( '删除资源', attachment_path(file),
-                                           :data => {:confirm => l(:text_are_you_sure)}, :method => :delete,:class => "postOptionLink") if (delete_allowed || User.current.id == file.author_id) && file.container_id == org_subfield.id && file.container_type == "OrgSubfield" && file.destroyable %>
-                        </li>
-                    </ul>
-                  <%else%>
-                      <ul class="resourceSendO">
-                        <li><%= link_to("发&nbsp;&nbsp;送".html_safe, 'javascript:void(0)',:class => "postOptionLink2",:onclick=>"show_send('#{file.id}','#{User.current.id}','file')")  %></li>
-                      </ul>
-                  <% end %>
+  <% if file.is_public == 1 or User.current.member_of_org?(file.container.organization) %>
+    <div class="resources mt10" id="container_files_<%= file.id %>">
+        <div class="homepagePostBrief">
+          <div class="homepagePostPortrait">
+            <%= link_to image_tag(url_to_avatar(file.author), :width => 50, :height => 50), user_path(file.author) %>
+          </div>
+          <div class="homepagePostDes">
+            <div class="homepagePostTitle break_word mt-4">
+              <%= link_to file.is_public? ? truncate(file.filename, length: 70) : truncate(file.filename,length: 50, omission: '...'),
+                          download_named_attachment_path(file.id, file.filename),
+                          :title => file.filename+"\n"+file.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;",:class => "linkGrey3 f_14 f_l"  %>
+              <%= file_preview_eye(file, class: 'preview') %>
+              <span id="image_private_<%= file.id%>">
+                <% if file.is_public? == false%>
+                   <span class="img_private ml5">私有</span>
+                <%end %>
+              </span>
+              <br/>
+            </div>
+            <div class="mt5">
+              <span class="fontGrey2 mr15 fl">上传时间：<%= format_date(file.created_on)%></span>
+              <% if file.tag_list.length > 0%>
+                  <span class="fontGrey2 fl mr15">上传类型：<%= file.tag_list[0] %></span>
               <% end %>
-            </li>
-          </ul>
+              <p class="f_l mb5 fontGrey2">文件大小：<%= number_to_human_size(file.filesize) %></p>
+              <p class="fl ml15 fontGrey2">下载<%= file.downloads%>&nbsp;&nbsp;|&nbsp;&nbsp;引用<span id="reference_number_<%= file.id %>"><%= file.quotes.nil? ? 0:file.quotes  %></span></p>
+            </div>
+            <div class="cl"></div>
+            <div class="tag_h">
+              <%= render :partial => 'tags/tag_new', :locals => {:obj => file, :object_flag => "6"} %>
+              <%= render :partial => 'tags/tag_add', :locals => {:obj => file, :object_flag => "6"} %>
+            </div>
+            <div class="homepagePostSetting">
+              <ul>
+                <li class="homepagePostSettingIcon">
+                  <% if User.current.logged? %>
+                     <% if (delete_allowed || User.current.id == file.author_id) && file.container_id == org_subfield.id && file.container_type == "OrgSubfield"  %>
+                        <ul class="homepagePostSettiongText">
+                          <li><%= link_to("发&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;送".html_safe, 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{file.id}','#{User.current.id}','file')")  %></li>
+                            <li><%= link_to '更新版本',attachments_versions_path(file),:class => "postOptionLink",:remote=>true %></li>
+                            <li>
+                              <span id="is_public_<%= file.id %>">
+                                <%= link_to (file.is_public? ? "设为私有":"设为公开"), update_file_dense_attachments_path(:attachmentid=>file.id,:newtype=>(file.is_public? ? 0:1)),:remote=>true,:class=>"postOptionLink",:method => :post  %>
+                              </span>
+                            </li>
+                            <li>
+                              <%= link_to( '删除资源', attachment_path(file),
+                                               :data => {:confirm => l(:text_are_you_sure)}, :method => :delete,:class => "postOptionLink") if (delete_allowed || User.current.id == file.author_id) && file.container_id == org_subfield.id && file.container_type == "OrgSubfield" && file.destroyable %>
+                            </li>
+                        </ul>
+                      <%else%>
+                          <ul class="resourceSendO">
+                            <li><%= link_to("发&nbsp;&nbsp;送".html_safe, 'javascript:void(0)',:class => "postOptionLink2",:onclick=>"show_send('#{file.id}','#{User.current.id}','file')")  %></li>
+                          </ul>
+                      <% end %>
+                  <% end %>
+                </li>
+              </ul>
 
+            </div>
+          </div>
+          <div class="cl"></div>
         </div>
-      </div>
-      <div class="cl"></div>
-    </div>
 
   </div><!---re_con_box end-->
+  <% end %>
 <% end %>
 
 <% if org_subfield_attachments.count == 10 %>
diff --git a/app/views/files/_subfield_files.html.erb b/app/views/files/_subfield_files.html.erb
index 6531aa96b..7fb9e2e0a 100644
--- a/app/views/files/_subfield_files.html.erb
+++ b/app/views/files/_subfield_files.html.erb
@@ -54,7 +54,7 @@
           <%= render :partial => "files/subfield_tags", :locals => {:tag_list => @tag_list,:org_subfield => @org_subfield,:tag_name => @tag_name}%>
         </div>
         <div class="cl"></div>
-        <p class="f_l  fontBlue f_b f_14">共有&nbsp;<span id="attachment_count"><%= @all_attachments.count %></span>&nbsp;个资源</p>
+        <p class="f_l  fontBlue f_b f_14">共有&nbsp;<span id="attachment_count"><%= User.current.member_of_org?(@org_subfield.organization) ? @all_attachments.count : @all_attachments.select{|attach| attach.is_public == 1 }.count %></span>&nbsp;个资源</p>
         <p class="f_r" style="color: #808080">
           <% if @order == "asc" %>
               按&nbsp;<%= link_to "时间",params.merge(:sort=>"created_on:desc"),:class => "f_b c_grey",:remote => @is_remote %><%= render partial: 'files/arrow_show',locals: { sort: @sort,order:@order,current:"created_on"} %>&nbsp;/&nbsp;