From e39e02d970ad3300af7b0a559f195698d02a2aa1 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Tue, 3 Aug 2021 10:47:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8B=E6=B8=B8=E7=BB=93?=
 =?UTF-8?q?=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/MarketPerformanceSetController.class.php    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Application/Admin/Controller/MarketPerformanceSetController.class.php b/Application/Admin/Controller/MarketPerformanceSetController.class.php
index dd410eab6..56e8f911d 100644
--- a/Application/Admin/Controller/MarketPerformanceSetController.class.php
+++ b/Application/Admin/Controller/MarketPerformanceSetController.class.php
@@ -263,7 +263,7 @@ class MarketPerformanceSetController extends Controller {
         $where = [
             "_string"=>"statement_begin_time between {$this->beginThismonth} and {$this->endThismonth} OR statement_end_time between {$this->beginThismonth} and {$this->endThismonth}",
             "company_type"=>2,
-            "withdraw_type"=>0
+            "withdraw_type"=>['in',"0,1"]
         ];
         $statement_pool = M("company_statement_pool","tab_")->where($where)->order("statement_begin_time desc")->select();
         //获取结算分段
@@ -285,7 +285,9 @@ class MarketPerformanceSetController extends Controller {
                 $tem['end_time'] = date("Y.m.d",$this->endThismonth);
             }
             $this->getPuAllStatement($tem,$v);
-            $this->getPuCompanyStatement($tem);//对公周结
+            if($v['withdraw_type'] == "0"){
+                $this->getPuCompanyStatement($tem);//对公周结
+            }
             $date_arr[] = $tem;
         }
         //2.获取对公的下游
@@ -297,7 +299,6 @@ class MarketPerformanceSetController extends Controller {
             "withdraw_type"=>1
         ];
         $this->getPuCompanyStatement($tem);
-        
     }
     /**
      * 获取所有个人周结