OSDN Git Service

refs #1610 マージミスを修正
authorYOSHIDA Hiroki <hyoshida@appirits.com>
Fri, 14 Jun 2013 10:00:43 +0000 (19:00 +0900)
committerYOSHIDA Hiroki <hyoshida@appirits.com>
Fri, 14 Jun 2013 10:01:33 +0000 (19:01 +0900)
app/models/mail_magazine.rb

index 075abc6..5ecfc3b 100644 (file)
@@ -122,7 +122,7 @@ and c.activate = 2
     "and #{MergeAdapterUtil.concat('c.family_name', 'c.first_name')} like ? "
   end}
 #{unless condition.customer_name_kana.blank?
-    condition << "%#{condition.customer_name_kana}%"
+    conditions << "%#{condition.customer_name_kana}%"
     "and #{MergeAdapterUtil.concat('c.family_name_kana', 'c.first_name_kana')} like ? "
   end}
 #{if condition.sex_male == "1" && condition.sex_female == "0"