From 81cbb76d7834a06427c18054c46b3d4b654c0019 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 14 Apr 2015 19:50:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B/=E9=A1=B9=E7=9B=AE--?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=88=90=E5=91=98=EF=BC=9A=E7=94=A8=E7=9C=9F?=
 =?UTF-8?q?=E5=AE=9E=E5=A7=93=E5=90=8D=E6=90=9C=E7=B4=A2=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E9=9C=80=E8=A6=81=E5=9C=A8=E5=A7=93=E5=92=8C?=
 =?UTF-8?q?=E5=90=8D=E4=B9=8B=E9=97=B4=E5=8A=A0=E4=B8=AA=E7=A9=BA=E6=A0=BC?=
 =?UTF-8?q?=E6=89=8D=E5=8F=AF=E4=BB=A5=E6=90=9C=E5=88=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/principal.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/models/principal.rb b/app/models/principal.rb
index 5aa21768f..dfec5b911 100644
--- a/app/models/principal.rb
+++ b/app/models/principal.rb
@@ -42,7 +42,8 @@ class Principal < ActiveRecord::Base
       where({})
     else
       pattern = "%#{q}%"
-      sql = %w(login firstname lastname mail).map {|column| "LOWER(#{table_name}.#{column}) LIKE LOWER(:p)"}.join(" OR ")
+      # sql = %w(login firstname lastname mail).map {|column| "LOWER(#{table_name}.#{column}) LIKE LOWER(:p)"}.join(" OR ")
+      sql= "LOWER(concat(lastname,firstname)) LIKE LOWER(:p) or LOWER(login) LIKE LOWER(:p) or LOWER(mail) LIKE LOWER(:p)"
       params = {:p => pattern}
       if q =~ /^(.+)\s+(.+)$/
         a, b = "#{$1}%", "#{$2}%"