Index: branches/dev/data/class/SC_CustomerList.php
===================================================================
--- branches/dev/data/class/SC_CustomerList.php	(revision 11624)
+++ branches/dev/data/class/SC_CustomerList.php	(revision 11627)
@@ -140,6 +140,32 @@
 		//¡¡E-MAIL
 		if (strlen($this->arrSql['email']) > 0) {
+
+			$search_all = 'all';
+			$search_pc = 'email';
+			$search_mobile = 'email_mobile';
+			
 			//¥«¥ó¥Þ¶èÀÚ¤ê¤ÇÊ£¿ô¤Î¾ò·ï»ØÄê²Äǽ¤Ë
 			$this->arrSql['email'] = explode(",", $this->arrSql['email']);
+			
+			//¡¡¥á¡¼¥ë¼ïÊÌ
+			if ( is_array( $this->arrSql['mail_type'] ) ){
+
+				if(in_array(MAIL_TYPE_PC, $this->arrSql['mail_type']) && !in_array(MAIL_TYPE_MOBILE, $this->arrSql['mail_type'])) {
+					// PC¤Î¤ß¸¡º÷
+					$search_patern = $search_pc;			
+				} else if(!in_array(MAIL_TYPE_PC, $this->arrSql['mail_type']) && in_array(MAIL_TYPE_MOBILE, $this->arrSql['mail_type'])) {
+					// ¥â¥Ð¥¤¥ë¤Î¤ß¸¡º÷
+					$search_patern = $search_mobile;
+				} else {
+					// Á´¸¡º÷
+					$search_patern = $search_all;
+				}
+				
+			} else {
+				// Á´¸¡º÷
+				$search_patern = $search_all;				
+			}
+
+
 			$sql_where = "";
 			foreach($this->arrSql['email'] as $val) {
@@ -147,14 +173,16 @@
 				//¸¡º÷¾ò·ï¤ò´Þ¤Þ¤Ê¤¤
 				if($this->arrSql['not_emailinc'] == '1') {
+					
 					if($sql_where == "") {
-						$sql_where .= "dtb_customer.email NOT ILIKE ? ";
+						$sql_where .= "(dtb_customer.email NOT ILIKE ? OR dtb_customer.email_maile NOT ILIKE ?) ";
 					} else {
-						$sql_where .= "AND dtb_customer.email NOT ILIKE ? ";
+						$sql_where .= "AND (dtb_customer.email NOT ILIKE ? OR dtb_customer.email_maile NOT ILIKE ?) ";
 					}
+					
 				} else {				
 					if($sql_where == "") {
-						$sql_where .= "dtb_customer.email ILIKE ? ";
+						$sql_where .= "(dtb_customer.email ILIKE ? OR dtb_customer.email_maile ILIKE ?) ";
 					} else {
-						$sql_where .= "OR dtb_customer.email ILIKE ? ";
+						$sql_where .= "OR (dtb_customer.email ILIKE ? OR dtb_customer.email_maile ILIKE ?)  ";
 					}
 				}
@@ -164,23 +192,5 @@
 			$this->setWhere($sql_where);
 		}
-	
-		//¡¡·ÈÂÓÍѥ᡼¥ë¥¢¥É¥ì¥¹
-		if (strlen($this->arrSql['email_mobile']) > 0) {
-			//¥«¥ó¥Þ¶èÀÚ¤ê¤ÇÊ£¿ô¤Î¾ò·ï»ØÄê²Äǽ¤Ë
-			$this->arrSql['email_mobile'] = explode(",", $this->arrSql['email_mobile']);
-			$sql_where = "";
-			foreach($this->arrSql['email_mobile'] as $val) {
-				$val = trim($val);
-				if($sql_where == "") {
-					$sql_where .= "dtb_customer.email_mobile ILIKE ? ";
-				} else {
-					$sql_where .= "OR dtb_customer.email_mobile ILIKE ? ";
-				}
-				$this->arrVal[] = $this->addSearchStr($val);
-			}
-			$this->setWhere($sql_where);
-		}
-		
-				
+					
 		//¡¡HTML-mail
 		if ( $mode == 'magazine' ){