From 3ff79ce6c18dd7d70f4c75466f24e31953efd5a8 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Thu, 23 Jul 2020 20:10:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=85=AC=E4=BC=9A=E6=A3=80?=
 =?UTF-8?q?=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CompanyRelationController.class.php         | 17 ++++-------------
 .../Admin/View/CompanyRelation/index.html       |  9 +++++++--
 .../Admin/View/CompanyRelation/lists.html       |  8 ++++++--
 3 files changed, 17 insertions(+), 17 deletions(-)

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 @@
                     </volist>
                 </select>
             </div>
-            <div class="input-list input-list-promote search_label_rehab">
+
+            <div class="input-list">
+                <input style="width: 200px;" type="text" name="company_name" class="search-input" value="{:I('company_name')}" placeholder="请输入公司名称搜索">&nbsp;
+            </div>
+
+            <!-- <div class="input-list input-list-promote search_label_rehab">
                 <select id="company_id" name="company_id" class="select_gallery" >
                     <option value="">请先选择公司类型</option>
                 </select>
-            </div>
+            </div> -->
 
             <div class="input-list input-list-game search_label_rehab">
                 <select id="settlement_type" name="settlement_type" class="select_gallery" >
diff --git a/Application/Admin/View/CompanyRelation/lists.html b/Application/Admin/View/CompanyRelation/lists.html
index 8a8e036e0..c21b42664 100644
--- a/Application/Admin/View/CompanyRelation/lists.html
+++ b/Application/Admin/View/CompanyRelation/lists.html
@@ -81,11 +81,15 @@
                     </volist>
                 </select>
             </div>
-            <div class="input-list input-list-promote search_label_rehab">
+            <div class="input-list">
+                <input style="width: 200px;" type="text" name="company_name" class="search-input" value="{:I('company_name')}" placeholder="请输入公司名称搜索">&nbsp;
+            </div>
+
+            <!-- <div class="input-list input-list-promote search_label_rehab">
                 <select id="company_id" name="company_id" class="select_gallery" >
                     <option value="">请先选择公司类型</option>
                 </select>
-            </div>
+            </div> -->
 
             <div class="input-list input-list-game search_label_rehab">
                 <select id="settlement_type" name="settlement_type" class="select_gallery" >