Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop

app/views/ecs/_department_list.html.erb

@@ -29,7 +29,7 @@
       </p>
     </span>
     <span class="column-5">
-      <% if major_manager %>
+      <% if @is_school_manager %>
         <a href="javascript:void(0)" class="mr15 color-grey-c" onclick="delete_confirm_box_2('<%= ec_major_school_path(major_school) %>','是否确认删除')">删除</a>
       <% end %>
         <a href="<%= ec_major_school_path(major_school) %>" class="color-blue"><%= major_manager ? "配置" : "查看" %></a>

app/views/ecs/_school_manager.html.erb

@@ -1,6 +1,6 @@
 <% major_school.users.each do |user| %>
   <span class="MajorName"><%= user.show_real_name %>
-    <% if @is_school_manager || major_school.users.where(:id => User.current.id).count > 0 %>
+    <% if @is_school_manager %>
       <i class="iconfont icon-htmal5icon19 font-16" onclick="delete_confirm_box_2('<%= delete_manager_ec_major_school_path(major_school, :user_id => user.id) %>','是否确认删除')"></i>
     <% end %>
   </span>