Changeset 478 for pro-violet-viettel/sourcecode/application/modules/admin/models/collabolator_model.php

Timestamp:

Nov 12, 2014 9:28:43 AM (11 years ago)

Author:

quyenla

Message:

thong ke

File:

• pro-violet-viettel/sourcecode/application/modules/admin/models/collabolator_model.php (modified) (2 diffs)

pro-violet-viettel/sourcecode/application/modules/admin/models/collabolator_model.php

@@ -123 +123 @@
         if ($data['keyword']) {
             if ($data['search_field'] == "cellphone") {
-                $where.=" WHERE (tblcollaborator.cellphone LIKE '%" . $data['keyword'] . "%')";
-            } else {
-                $where.=" WHERE (full_name LIKE '%" . $data['keyword'] . "%' OR login_name LIKE '%" . $data['keyword'] . "%') ";
+                $where.=" WHERE (tbluser.cellphone LIKE '%" . $data['keyword'] . "%')";
             }
         }
@@ -153 +151 @@
         if ($data['keyword']) {
             if ($data['search_field'] == "cellphone") {
-                $where.=" WHERE (tblcollaborator.cellphone LIKE '%" . $data['keyword'] . "%')";
-            } else {
-                $where.=" WHERE (full_name LIKE '%" . $data['keyword'] . "%' OR login_name LIKE '%" . $data['keyword'] . "%') ";
-            }
+                $where.=" WHERE (tbluser.cellphone LIKE '%" . $data['keyword'] . "%')";
+            } 
         }
        // $from = date("Y-m-d 00:00:00",$from); 
         $sql="SELECT *,tblcollaborator.created_time as collaborator_created_time,tbluser.cellphone as user_cellphone,tblcollaborator.cellphone as collaborator_cellphone, tbluser.created_time as user_created_time  FROM ".$this->table_name." INNER JOIN tbluser ON tbluser.collaborator = tblcollaborator.id ".$where." AND tbluser.collaborator = ".$data['id']." ".$order." LIMIT " . $data['start'] . ", " . $data['perpage'] . " ";
-   
         $result = $this->db->query($sql)->result_array();
         foreach ($result as $index=>$paidlog)