From 3349304e107aa2625e14fddbf809bb1da5140b7f Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Sat, 11 Jul 2020 17:01:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=8A=E6=B8=B8=E9=A2=84?=
 =?UTF-8?q?=E8=AD=A6=E9=87=91=E9=A2=9D=E8=AF=BB=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Application/Admin/Controller/PartnerController.class.php b/Application/Admin/Controller/PartnerController.class.php
index 4ec627433..05028576c 100644
--- a/Application/Admin/Controller/PartnerController.class.php
+++ b/Application/Admin/Controller/PartnerController.class.php
@@ -61,14 +61,16 @@ class PartnerController extends ThinkController
 
         //获取分页数据
         $query = $model->alias('p')
-            ->field("p.*")
             ->where($map)
             ->order("id desc");
         if($is_export){
             $partners = $query
-                ->select();
+            ->field("p.*,IFNULL(d.advance_amount,'--') advance_amount")
+            ->join("left join tab_partner_divide_warn d ON d.partner_id = p.id AND d.status = 1")
+            ->select();
         }else{
             $partners = $query
+                ->field("p.*")
                 ->page($page,$row)
                 ->select();
         }