From 4ed51cb112752da56691b2ad4c073b611a505c8a Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Wed, 26 Aug 2020 10:54:30 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=8A=E4=B8=8B=E6=B8=B8=E8=81=9A?=
 =?UTF-8?q?=E5=90=88=E6=89=93=E6=AC=BE=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/View/CompanyStatement/viewSpecialComplement.html     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Application/Admin/View/CompanyStatement/viewSpecialComplement.html b/Application/Admin/View/CompanyStatement/viewSpecialComplement.html
index ceb1eb76d..4f99690b6 100644
--- a/Application/Admin/View/CompanyStatement/viewSpecialComplement.html
+++ b/Application/Admin/View/CompanyStatement/viewSpecialComplement.html
@@ -174,7 +174,6 @@
             </div>
             <div class="input-list input-list-game search_label_rehab">
                 <select id="relation_game_id" name="relation_game_id[]" class="select_gallery" multiple="multiple">
-                    <option value="">请选择游戏产品</option>
                     <volist name="gameList" id="vo">
                         <option value="{$vo.relation_game_id}" <if condition="$vo.relation_game_id eq I('relation_game_id')">selected</if> >{$vo.relation_game_name}</option>
                     </volist>
@@ -637,7 +636,7 @@
                 var url = "{:U('Ajax/getPromoteGameList')}"+"&game_ids="+data;
                 $.get(url,function(data){
                     var game = data;
-                    var gamestr = '<option value="">请选择游戏商品</option>';
+                    var gamestr = '';
                     for (var i in game) {
                         if(game[i].id == game_id){
                             gamestr += "<option value='" + game[i].relation_game_id + "' selected='selected'>" + game[i].relation_game_name + "</option>"

From 2c005d1996cb1aaf5753f973791354c79ab6898b Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Wed, 26 Aug 2020 11:08:31 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=89=B9=E6=AE=8A=E8=A1=A5=E7=82=B9?=
 =?UTF-8?q?=E6=B1=87=E6=80=BB=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/CompanyStatementLackController.class.php    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Application/Admin/Controller/CompanyStatementLackController.class.php b/Application/Admin/Controller/CompanyStatementLackController.class.php
index 425229108..dacf289f1 100644
--- a/Application/Admin/Controller/CompanyStatementLackController.class.php
+++ b/Application/Admin/Controller/CompanyStatementLackController.class.php
@@ -113,6 +113,9 @@ class CompanyStatementLackController extends ThinkController
         }
         //获取基本信息
         $dbres = $this->DBModel->where("id='{$id}'")->select();
+
+        $withdraw_type = $dbres[0]['withdraw_type'];
+
         $title = $dbres[0]['company_name'];
         $this->assign("title",$title);
 
@@ -121,9 +124,9 @@ class CompanyStatementLackController extends ThinkController
             A("CompanyStatementPool")->viewCpPool($dbres,$is_export);
         }elseif($dbres[0]['company_type'] == 1){
             //下游公司
-            A("CompanyStatementPool")->viewPcPool($dbres,$is_export);
+            A("CompanyStatementPool")->viewPcPool($dbres,$is_export,$withdraw_type);
         }else{
-            A("CompanyStatementPool")->viewPuPool($dbres,$is_export);
+            A("CompanyStatementPool")->viewPuPool($dbres,$is_export,$withdraw_type);
         }
     }