From 4cf512779a3a997baba699352e7724c9d6edcde4 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Tue, 22 Sep 2020 14:16:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=9A=E5=90=88=E5=85=AC=E5=8F=B8=E7=BB=91?=
 =?UTF-8?q?=E5=AE=9A=E5=8A=9F=E8=83=BD=E5=8F=8A=E6=B1=87=E6=80=BB=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E8=AF=AD=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/AggregateRelationController.class.php  | 6 +++---
 Application/Admin/View/AggregateStatementPool/lists.html    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Application/Admin/Controller/AggregateRelationController.class.php b/Application/Admin/Controller/AggregateRelationController.class.php
index d193ae28d..1dc77c810 100644
--- a/Application/Admin/Controller/AggregateRelationController.class.php
+++ b/Application/Admin/Controller/AggregateRelationController.class.php
@@ -152,10 +152,10 @@ class AggregateRelationController extends AdminController
         }
         $where['_string'] = '1 = 1';
         if(isset($params['company_type'])){
-            $where['_string'] .= " AND (first_company_type='{$params['company_type']}' OR second_company_type='{$params['company_type']}')";
+            $where['_string'] .= " 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']}%')";
+            $where['_string'] .= " AND (second_company_name LIKE '%{$params['company_name']}%')";
         }
 
         if(isset($params['settlement_type'])){
@@ -172,7 +172,7 @@ class AggregateRelationController extends AdminController
         }
 
         // $this->checkListOrCountAuthRestMap($where);//导出权限
-        $dbres = $this->DBlogModel->where($where)->where("first_company_type = 3 or second_company_type = 3")->order("FIELD(status,0,1,-1,-2,2),id desc");;
+        $dbres = $this->DBlogModel->where("first_company_type = 3 or second_company_type = 3")->where($where)->order("FIELD(status,0,1,-1,-2,2),id desc");
         if(isset($params['export'])){
             $dbres = $dbres->select();
         }else{
diff --git a/Application/Admin/View/AggregateStatementPool/lists.html b/Application/Admin/View/AggregateStatementPool/lists.html
index cdc941341..9928dc605 100644
--- a/Application/Admin/View/AggregateStatementPool/lists.html
+++ b/Application/Admin/View/AggregateStatementPool/lists.html
@@ -372,7 +372,7 @@
                     return;
                 }
                 if(text.length < 1){
-                    layer.msg("<font style='color:white'>" + '请先选择要导出的结算单' + "</font>");
+                    layer.msg("<font style='color:white'>" + '请先选择要导出的结算单，选中结算金额全为0的汇总单自动忽略' + "</font>");
                     return;
                 }
                 if(flag){