聚合公司绑定功能及汇总提示语添加

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{

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){