From 587d7913cacf1b5898004cce39b6eea79336f4f6 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Wed, 1 Jul 2020 12:20:28 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A3=80=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/CompanyGameRatioController.class.php   | 4 ++--
 .../Admin/Controller/CompanyRelationController.class.php    | 4 ++--
 .../Admin/Controller/CompanyStatementController.class.php   | 2 +-
 .../Controller/CompanyStatementLackController.class.php     | 6 +++---
 .../Controller/CompanyStatementPoolController.class.php     | 6 +++---
 Application/Admin/View/CompanyStatement/lists.html          | 3 ---
 6 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/Application/Admin/Controller/CompanyGameRatioController.class.php b/Application/Admin/Controller/CompanyGameRatioController.class.php
index 096dc1c88..12b7dc362 100644
--- a/Application/Admin/Controller/CompanyGameRatioController.class.php
+++ b/Application/Admin/Controller/CompanyGameRatioController.class.php
@@ -143,7 +143,7 @@ class CompanyGameRatioController extends AdminController
                 ->join("JOIN tab_promote_company p ON ( m.company_id = p.id".$pwhere.")")
                 ->where($where)->find()['count'];
         $this->assign('data', $dbres);
-        $page = set_pagination($count, $row);
+        $page = set_pagination($count, $row,$params);
         if($page) {
             $this->assign('_page', $page);
         }
@@ -317,7 +317,7 @@ class CompanyGameRatioController extends AdminController
                 ->join("JOIN tab_promote_company p ON ( m.company_id = p.id".$pwhere.")")
                 ->where($where)->find()['count'];
         $this->assign('data', $dbres);
-        $page = set_pagination($count, $row);
+        $page = set_pagination($count, $row,$params);
         if($page) {
             $this->assign('_page', $page);
         }
diff --git a/Application/Admin/Controller/CompanyRelationController.class.php b/Application/Admin/Controller/CompanyRelationController.class.php
index ea53aec9e..ae08d1d68 100644
--- a/Application/Admin/Controller/CompanyRelationController.class.php
+++ b/Application/Admin/Controller/CompanyRelationController.class.php
@@ -107,7 +107,7 @@ class CompanyRelationController extends AdminController
 
         $count = $this->DBModel->field("count(id) count")->where($where)->find()['count'];
         $this->assign('data', $dbres);
-        $page = set_pagination($count, $row);
+        $page = set_pagination($count, $row,$params);
         if($page) {
             $this->assign('_page', $page);
         }
@@ -223,7 +223,7 @@ class CompanyRelationController extends AdminController
 
         $count = $this->DBlogModel->field("count(id) count")->where($where)->find()['count'];
         $this->assign('data', $dbres);
-        $page = set_pagination($count, $row);
+        $page = set_pagination($count, $row,$params);
         if($page) {
             $this->assign('_page', $page);
         }
diff --git a/Application/Admin/Controller/CompanyStatementController.class.php b/Application/Admin/Controller/CompanyStatementController.class.php
index d52539bf1..9dba96891 100644
--- a/Application/Admin/Controller/CompanyStatementController.class.php
+++ b/Application/Admin/Controller/CompanyStatementController.class.php
@@ -180,7 +180,7 @@ class CompanyStatementController extends ThinkController
         // dd($count);
         $parameter['p'] = $page;
         $parameter['row'] = $row;
-        $page = set_pagination($count['count'], $row, $parameter);
+        $page = set_pagination($count['count'], $row, $params);
         if ($page) {
             $this->assign('_page', $page);
         }
diff --git a/Application/Admin/Controller/CompanyStatementLackController.class.php b/Application/Admin/Controller/CompanyStatementLackController.class.php
index ecc86fd4b..6e5d63cc3 100644
--- a/Application/Admin/Controller/CompanyStatementLackController.class.php
+++ b/Application/Admin/Controller/CompanyStatementLackController.class.php
@@ -83,9 +83,9 @@ class CompanyStatementLackController extends ThinkController
         
         $count =  $this->DBModel->field("count(id) count,sum(statement_money) statement_money")->where($map)->find();
         // dd($count);
-        $parameter['p'] = $page;
-        $parameter['row'] = $row;
-        $page = set_pagination($count['count'], $row, $parameter);
+        $params['p'] = $page;
+        $params['row'] = $row;
+        $page = set_pagination($count['count'], $row, $params);
         if ($page) {
             $this->assign('_page', $page);
         }
diff --git a/Application/Admin/Controller/CompanyStatementPoolController.class.php b/Application/Admin/Controller/CompanyStatementPoolController.class.php
index 3444a8998..8882d4205 100644
--- a/Application/Admin/Controller/CompanyStatementPoolController.class.php
+++ b/Application/Admin/Controller/CompanyStatementPoolController.class.php
@@ -165,9 +165,9 @@ class CompanyStatementPoolController extends ThinkController
         }
         $count =  $this->DBModel->field("count(id) count,SUM(statement_money) as statement_money")->where($map)->find();
         // dd($count);
-        $parameter['p'] = $page;
-        $parameter['row'] = $row;
-        $page = set_pagination($count['count'], $row, $parameter);
+        $params['p'] = $page;
+        $params['row'] = $row;
+        $page = set_pagination($count['count'], $row, $params);
         if ($page) {
             $this->assign('_page', $page);
         }
diff --git a/Application/Admin/View/CompanyStatement/lists.html b/Application/Admin/View/CompanyStatement/lists.html
index 8ac880843..1aaafbdae 100644
--- a/Application/Admin/View/CompanyStatement/lists.html
+++ b/Application/Admin/View/CompanyStatement/lists.html
@@ -252,9 +252,6 @@
 
     </div>
     <div class="page">
-        <if condition="$role_export_check eq true ">
-            <!-- <a class="sch-btn" href="{:U(CONTROLLER_NAME.'/'.ACTION_NAME,array_merge(['export'=>1],I('get.')))}" target="_blank">导出</a> -->
-        </if>
         {$_page|default=''}
     </div>
     <div style="width: 100vw;height: 100vh;padding: 0;position: absolute;top: 0;z-index: 9999;display: none;" id="creat_msg">

From 35380ae9b0af311918b13d110b2f4499396e17c9 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Wed, 1 Jul 2020 12:23:53 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=90=9C=E7=B4=A22?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/CompanyStatementController.class.php     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Application/Admin/Controller/CompanyStatementController.class.php b/Application/Admin/Controller/CompanyStatementController.class.php
index 9dba96891..67e945a4d 100644
--- a/Application/Admin/Controller/CompanyStatementController.class.php
+++ b/Application/Admin/Controller/CompanyStatementController.class.php
@@ -178,8 +178,8 @@ class CompanyStatementController extends ThinkController
         }
         $count =  M("company_statement","tab_")->field("count(id) count,IFNULL(SUM(CASE WHEN withdraw_type < 2 THEN platform_amount ELSE 0 END),0) as platform_amount,SUM(statement_money) as statement_money")->where($map)->find();
         // dd($count);
-        $parameter['p'] = $page;
-        $parameter['row'] = $row;
+        $params['p'] = $page;
+        $params['row'] = $row;
         $page = set_pagination($count['count'], $row, $params);
         if ($page) {
             $this->assign('_page', $page);

From 048931ce9e0cb47ef1a4bacca5ca7f7a76a8af06 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Wed, 1 Jul 2020 12:30:43 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=90=9C=E7=B4=A23?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Controller/GameRatioMouldController.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Application/Admin/Controller/GameRatioMouldController.class.php b/Application/Admin/Controller/GameRatioMouldController.class.php
index d1d02b081..1183e0b55 100644
--- a/Application/Admin/Controller/GameRatioMouldController.class.php
+++ b/Application/Admin/Controller/GameRatioMouldController.class.php
@@ -81,7 +81,7 @@ class GameRatioMouldController extends AdminController
 
        $count = $this->DBModel->alias('m')->field("count(id) count")->join("INNER JOIN ({$gameres}) g ON m.relation_game_id = g.relation_game_id")->where($where)->find()['count'];
        $this->assign('data', $dbres);
-        $page = set_pagination($count, $row);
+        $page = set_pagination($count, $row,$params);
         if($page) {
             $this->assign('_page', $page);
         }