Merge pull request '调整' (#299) from KingChan/forgeplus:standalone_develop into standalone_develop

app/queries/admins/glcc_examine_material.rb

@@ -13,8 +13,7 @@ class Admins::GlccExamineMaterial < ApplicationQuery
     materials = GlccMediumTermExamineMaterial.all
 
     # term
-    term = params[:term] || [1, 2]
-    materials = materials.where(term: term) if term.present?
+    materials = materials.where(term: params[:term]) if params[:term].present?
     #year
     year = if params[:date]
       params[:date][:year] 

app/views/admins/glcc_pr_check/index.html.erb

@@ -2,7 +2,7 @@
   <%= form_tag(admins_glcc_pr_check_index_path, method: :get, class: 'form-inline search-form flex-1', remote: true) do %>
     <div class="form-group mr-2">
       <label for="status">考核选项：</label>
-      <% status_options = [['全部',]['中期考核',1], ['结项考核', 2]] %>
+      <% status_options = [['全部','']['中期考核',1], ['结项考核', 2]] %>
       <%= select_tag(:term, options_for_select(status_options), class: 'form-control') %>
     </div>