diff --git a/Application/Admin/Controller/CompanyRelationController.class.php b/Application/Admin/Controller/CompanyRelationController.class.php index fc80ec77f..75cceab18 100644 --- a/Application/Admin/Controller/CompanyRelationController.class.php +++ b/Application/Admin/Controller/CompanyRelationController.class.php @@ -71,12 +71,8 @@ class CompanyRelationController extends AdminController if(isset($params['company_type'])){ $where['_string'] .= " AND (first_company_type='{$params['company_type']}' OR second_company_type='{$params['company_type']}')"; } - if(isset($params['company_id'])){ - $where['_string'] .= " AND (first_company_id='{$params['company_id']}' OR second_company_id='{$params['company_id']}')"; - } - if(isset($params['company_type']) && isset($params['company_id'])){ - unset($where['_string']); - $where['_string'] .= " (first_company_id='{$params['company_id']}' AND first_company_type='{$params['company_type']}') OR (second_company_id='{$params['company_id']}' AND second_company_type='{$params['company_type']}')"; + if(isset($params['company_name'])){ + $where['_string'] .= " AND (first_company_name LIKE '%{$params['company_name']}%' OR second_company_name LIKE '%{$params['company_name']}%')"; } if(isset($params['settlement_type'])){ @@ -150,13 +146,8 @@ class CompanyRelationController extends AdminController if(isset($params['company_type'])){ $where['_string'] .= " AND (first_company_type='{$params['company_type']}' OR second_company_type='{$params['company_type']}')"; } - if(isset($params['company_id'])){ - $where['_string'] .= " AND (first_company_id='{$params['company_id']}' OR second_company_id='{$params['company_id']}')"; - - } - if(isset($params['company_type']) && isset($params['company_id'])){ - unset($where['_string']); - $where['_string'] .= " (first_company_id='{$params['company_id']}' AND first_company_type='{$params['company_type']}') OR (second_company_id='{$params['company_id']}' AND second_company_type='{$params['company_type']}')"; + if(isset($params['company_name'])){ + $where['_string'] .= " AND (first_company_name LIKE '%{$params['company_name']}%' OR second_company_name LIKE '%{$params['company_name']}%')"; } if(isset($params['settlement_type'])){ diff --git a/Application/Admin/View/CompanyRelation/index.html b/Application/Admin/View/CompanyRelation/index.html index 1b9ba8636..e38614566 100644 --- a/Application/Admin/View/CompanyRelation/index.html +++ b/Application/Admin/View/CompanyRelation/index.html @@ -76,11 +76,16 @@ -
+ +
+   +
+ +
-
+
+   +
+ +