From 1d81361c6a05eca1953896f42468dc1790ec3e12 Mon Sep 17 00:00:00 2001
From: kingChan <281221230@qq.com>
Date: Wed, 12 Jun 2024 17:36:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4Glcc=20PR?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/queries/admins/glcc_examine_material.rb   | 3 +--
 app/views/admins/glcc_pr_check/index.html.erb | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/queries/admins/glcc_examine_material.rb b/app/queries/admins/glcc_examine_material.rb
index 89eede29f..6f9213ddc 100644
--- a/app/queries/admins/glcc_examine_material.rb
+++ b/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] 
diff --git a/app/views/admins/glcc_pr_check/index.html.erb b/app/views/admins/glcc_pr_check/index.html.erb
index 0dd2b9f6b..fdcd58cad 100644
--- a/app/views/admins/glcc_pr_check/index.html.erb
+++ b/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>