From a3ec46c820e9144746c853cc12ad75343473c1b7 Mon Sep 17 00:00:00 2001
From: XuCheng642 <287102909@qq.com>
Date: Fri, 25 Aug 2017 19:54:05 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=BF=81=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_audit_pro_authentication_list.html.erb           |  2 +-
 .../managements/_pro_authentication_list.html.erb     |  1 -
 ...20170825113413_modify_support_shixuns_for_major.rb | 11 +++++++++++
 3 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 db/migrate/20170825113413_modify_support_shixuns_for_major.rb

diff --git a/app/views/managements/_audit_pro_authentication_list.html.erb b/app/views/managements/_audit_pro_authentication_list.html.erb
index c60a0cb78..cf0bbe687 100644
--- a/app/views/managements/_audit_pro_authentication_list.html.erb
+++ b/app/views/managements/_audit_pro_authentication_list.html.erb
@@ -16,7 +16,7 @@
                 <span><%= user.user_extensions.school.name %><%= user.user_extensions.department ? ' - '+user.user_extensions.department.name.to_s : '' %></span>
             <% end %>
             <% if user.user_extensions && user.user_extensions.identity %>
-                <span class="ml30"><%= user.identity %></span>
+                <!--<span class="ml30"><%#= user.identity %></span>-->
                 <% if user.user_extensions.identity == 1 && user.user_extensions.try(:student_id) %>
                     <span class="ml30"><%= user.user_extensions.try(:student_id) %></span>
                 <% else %>
diff --git a/app/views/managements/_pro_authentication_list.html.erb b/app/views/managements/_pro_authentication_list.html.erb
index 2364aedef..07a762adb 100644
--- a/app/views/managements/_pro_authentication_list.html.erb
+++ b/app/views/managements/_pro_authentication_list.html.erb
@@ -18,7 +18,6 @@
                     <span><%= user.user_extensions.school.name %><%= user.user_extensions.department ? ' - '+user.user_extensions.department.name.to_s : '' %></span>
                 <% end %>
                 <% if user.user_extensions && user.user_extensions.identity %>
-                    <span class="ml30"><%= user.identity %></span>
                     <% if user.user_extensions.identity == 1 && user.user_extensions.try(:student_id) %>
                         <span class="ml30"><%= user.user_extensions.try(:student_id) %></span>
                     <% else %>
diff --git a/db/migrate/20170825113413_modify_support_shixuns_for_major.rb b/db/migrate/20170825113413_modify_support_shixuns_for_major.rb
new file mode 100644
index 000000000..25028fa07
--- /dev/null
+++ b/db/migrate/20170825113413_modify_support_shixuns_for_major.rb
@@ -0,0 +1,11 @@
+class ModifySupportShixunsForMajor < ActiveRecord::Migration
+  def up
+    sql = "SELECT distinct(major_id) FROM `major_courses`"
+    MajorCourse.find_by_sql(sql).each do |mc|
+      Major.where(:id => mc).update_column(:support_shixuns, 1)
+    end
+  end
+
+  def down
+  end
+end

From 290df45c79bce27c4985f1b6d9d44ae59778ad4e Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 25 Aug 2017 20:10:11 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=BF=81=E7=A7=BB500?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/migrate/20170825113413_modify_support_shixuns_for_major.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/migrate/20170825113413_modify_support_shixuns_for_major.rb b/db/migrate/20170825113413_modify_support_shixuns_for_major.rb
index 25028fa07..f29f16808 100644
--- a/db/migrate/20170825113413_modify_support_shixuns_for_major.rb
+++ b/db/migrate/20170825113413_modify_support_shixuns_for_major.rb
@@ -2,7 +2,7 @@ class ModifySupportShixunsForMajor < ActiveRecord::Migration
   def up
     sql = "SELECT distinct(major_id) FROM `major_courses`"
     MajorCourse.find_by_sql(sql).each do |mc|
-      Major.where(:id => mc).update_column(:support_shixuns, 1)
+      Major.where(:id => mc.try(:major_id)).first.update_column(:support_shixuns, 1)
     end
   end