Index: branches/dev/data/class/SC_CustomerList.php
===================================================================
--- branches/dev/data/class/SC_CustomerList.php	(revision 11643)
+++ branches/dev/data/class/SC_CustomerList.php	(revision 11741)
@@ -140,32 +140,6 @@
 		//¡¡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) {
@@ -173,36 +147,19 @@
 				//¸¡º÷¾ò·ï¤ò´Þ¤Þ¤Ê¤¤
 				if($this->arrSql['not_emailinc'] == '1') {
-					
-					if($sql_where != "") {
-						$sql_where .= "AND ";
-					}						
-					
-					if($search_patern == $search_all) {
-						$sql_where .= "(dtb_customer.$search_pc NOT ILIKE ? OR dtb_customer.$search_mobile NOT ILIKE ?) ";
+					if($sql_where == "") {
+						$sql_where .= "dtb_customer.email NOT ILIKE ? ";
 					} else {
-						$sql_where .= "dtb_customer.$search_patern NOT ILIKE ? ";						
+						$sql_where .= "AND dtb_customer.email NOT ILIKE ? ";
 					}
-					
 				} else {				
-					if($sql_where != "") {
-						$sql_where .= "OR ";
+					if($sql_where == "") {
+						$sql_where .= "dtb_customer.email ILIKE ? ";
+					} else {
+						$sql_where .= "OR dtb_customer.email ILIKE ? ";
 					}
-						
-					if($search_patern == $search_all) {
-						$sql_where .= "(dtb_customer.$search_pc ILIKE ? OR dtb_customer.$search_mobile ILIKE ?) ";
-					} else {
-						$sql_where .= "dtb_customer.$search_patern ILIKE ?  ";
-					}
 				}
 				$searchEmail = $this->addSearchStr($val);
-				
-				if($search_patern == $search_all) {
-					$this->arrVal[] = $searchEmail;
-					$this->arrVal[] = $searchEmail;
-				} else {
-					$this->arrVal[] = $searchEmail;					
-				}
-			}
-			
+				$this->arrVal[] = $searchEmail;
+			}
 			$this->setWhere($sql_where);
 		}