From 5335ab2c7cc33bd87491d6fc396072e7b8b45724 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Thu, 25 Jul 2019 10:58:43 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=AD=90=E5=8D=95=E4=BD=8D=E6=97=A0=E6=B3=95=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=96=B0=E6=B7=BB=E5=8A=A0=E7=9A=84=E5=AD=A6=E6=A0=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/school_controller.rb | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/controllers/school_controller.rb b/app/controllers/school_controller.rb
index 1ecd5733..251400d5 100644
--- a/app/controllers/school_controller.rb
+++ b/app/controllers/school_controller.rb
@@ -126,21 +126,26 @@ class SchoolController < ApplicationController
            chinese << char
          end
     end
+    if pinyin.size > 0
+      search_str = "name like '%#{chinese.join("")}%' and pinyin like '%#{pinyin.join("")}%'"
+    else
+      search_str = "name like '%#{chinese.join("")}%'"
+    end
     if params[:no_school_ids]
       if(condition == '')
         @school = School.where("id not in #{params[:no_school_ids]}").reorder('CONVERT (name USING gbk) COLLATE gbk_chinese_ci asc').page((params[:page].to_i || 1)).per(100)
         @school_count = School.count
       else
-        @school = School.where("id not in #{params[:no_school_ids]} and name like '%#{chinese.join("")}%' and pinyin like '%#{pinyin.join("")}%'").reorder('CONVERT (name USING gbk) COLLATE gbk_chinese_ci asc').page((params[:page].to_i || 1)).per(100)
-        @school_count = School.where("id not in #{params[:no_school_ids]} and name like '%#{chinese.join("")}%' and pinyin like '%#{pinyin.join("")}%'").count
+        @school = School.where("id not in #{params[:no_school_ids]} and #{search_str}").reorder('CONVERT (name USING gbk) COLLATE gbk_chinese_ci asc').page((params[:page].to_i || 1)).per(100)
+        @school_count = School.where("id not in #{params[:no_school_ids]} and #{search_str}").count
       end
     else
       if(condition == '')
         @school = School.reorder('CONVERT (name USING gbk) COLLATE gbk_chinese_ci asc').page((params[:page].to_i || 1)).per(100)
         @school_count = School.count
       else
-        @school = School.where("name like '%#{chinese.join("")}%' and pinyin like '%#{pinyin.join("")}%'").reorder('CONVERT (name USING gbk) COLLATE gbk_chinese_ci asc').page((params[:page].to_i || 1)).per(100)
-        @school_count = School.where("name like '%#{chinese.join("")}%' and pinyin like '%#{pinyin.join("")}%'").count
+        @school = School.where(search_str).reorder('CONVERT (name USING gbk) COLLATE gbk_chinese_ci asc').page((params[:page].to_i || 1)).per(100)
+        @school_count = School.where(search_str).count
       end
     end