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

Gemfile

@@ -63,7 +63,7 @@ gem 'elasticsearch-rails'
 gem 'oauth2'
 
 # xlsx
-gem 'axlsx_rails', '0.3.0'
+# gem 'axlsx_rails', '0.3.0'
 
 #Ruby 2.2+ has removed test/unit from the core library.
 if RUBY_VERSION>='2.2'

app/controllers/managements_controller.rb

@@ -1416,7 +1416,8 @@ end
   def update_depart_identifier
     if params[:depart] && params[:identifier]
       @department = Department.where(:id => params[:depart]).first
-      @department.update_attributes(:identifier => params[:identifier]) if @department.present?
+      identifier = params[:identifier].strip.blank? ? nil : params[:identifier].strip
+      @department.update_attributes(:identifier => identifier) if @department.present?
     end
   end
 

app/models/school.rb

@@ -64,7 +64,7 @@ class School < ActiveRecord::Base
 
   def statistic_url
     dep = departments.where("identifier is not null").first
-    url = dep.present? ? "/colleges/#{dep.identifier}/statistics" : "/colleges/#{self.id}/statistics"
+    url = dep.present? && !dep.identifier.blank? ? "/colleges/#{dep.identifier}/statistics" : "/colleges/#{self.id}/statistics"
   end
 
   def course_act_time