From 8e71fc827cbfb25f6535986a2a2473894f510270 Mon Sep 17 00:00:00 2001
From: Edward <edward@roojs.com>
Date: Thu, 8 Nov 2018 14:34:40 +0800
Subject: [PATCH] DataObjects/Core_company.php

---
 DataObjects/Core_company.php | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/DataObjects/Core_company.php b/DataObjects/Core_company.php
index d352d558..abc15069 100644
--- a/DataObjects/Core_company.php
+++ b/DataObjects/Core_company.php
@@ -107,18 +107,16 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject
         if(!empty($q['query']['name']) || !empty($q['search']['name'])){
             
             $s = (!empty($q['query']['name'])) ? $this->escape($q['query']['name']) : $this->escape($q['search']['name']);
+            
             $this->whereAdd("
                 {$tn}.name LIKE '%$s%'
             ");
         }
-        if(){ 
-            $s = $this->escape($q['search']['name']);
-            $this->whereAdd("
-                {$tn}.name LIKE '%$s%'
-            ");
-        }
-        if(!empty($q['search']['name_starts'])){
-            $s = $this->escape($q['search']['name_starts']);
+        
+        if(!empty($q['query']['name_starts']) || !empty($q['search']['name_starts'])){
+            
+            $s = (!empty($q['query']['name_starts'])) ? $this->escape($q['query']['name_starts']) : $this->escape($q['search']['name_starts']);
+            
             $this->whereAdd("
                 {$tn}.name LIKE '$s%'
             ");
-- 
2.39.2