新增上游预警金额读取

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();
         }