修复缴费单显示错误

application/em/model/EmPayment.php

@@ -28,14 +28,12 @@ class EmPayment extends Base
             ->field('epi.invoice_id')
             ->field('em.em_numb')
             ->field('r.region_name')
-            ->leftJoin(['em_payment_invoice'=>'epi'],'epi.payment_id = pay.payment_id')
-            ->leftJoin(['em_invoice'=>'inv'],'epi.invoice_id = inv.invoice_id')
-//            ->leftJoin(['em_invoice_useage'=>'eiu'],'eiu.invoice_id=inv.invoice_id')
-//            ->leftJoin(['em_useage'=>'eu'],'eu.useage_id = eiu.useage_id')
-            ->leftJoin(['em_account'=>'ea'],'ea.account_id = pay.account_id')
-            ->leftJoin(['em'],'em.id=ea.em_id')
-            ->leftJoin(['station_info'=>'station'],'station.station_id=em.station_id')
-            ->leftJoin(['region'=>'r'],'station.area_id = r.id')
+            ->join(['em_payment_invoice'=>'epi'],'epi.payment_id = pay.payment_id')
+            ->join(['em_invoice'=>'inv'],'epi.invoice_id = inv.invoice_id')
+            ->join(['em_account'=>'ea'],'ea.account_id = pay.account_id')
+            ->join(['em'],'em.id=ea.em_id')
+            ->join(['station_info'=>'station'],'station.station_id=em.station_id')
+            ->join(['region'=>'r'],'station.area_id = r.id')
             ->where($map)
             ->page($Nowpage, $limits)
             ->select()
@@ -50,14 +48,14 @@ class EmPayment extends Base
             ->field('epi.invoice_id')
             ->field('em.em_numb')
             ->field('r.region_name')
-            ->leftJoin(['em_payment_invoice'=>'epi'],'epi.payment_id = pay.payment_id')
-            ->leftJoin(['em_invoice'=>'inv'],'epi.invoice_id = inv.invoice_id')
+            ->join(['em_payment_invoice'=>'epi'],'epi.payment_id = pay.payment_id')
+            ->join(['em_invoice'=>'inv'],'epi.invoice_id = inv.invoice_id')
 //            ->leftJoin(['em_invoice_useage'=>'eiu'],'eiu.invoice_id=inv.invoice_id')
 //            ->leftJoin(['em_useage'=>'eu'],'eu.useage_id = eiu.useage_id')
-            ->leftJoin(['em_account'=>'ea'],'ea.account_id = pay.account_id')
-            ->leftJoin(['em'],'em.id=ea.em_id')
-            ->leftJoin(['station_info'=>'station'],'station.station_id=em.station_id')
-            ->leftJoin(['region'=>'r'],'station.area_id = r.id')
+            ->join(['em_account'=>'ea'],'ea.account_id = pay.account_id')
+            ->join(['em'],'em.id=ea.em_id')
+            ->join(['station_info'=>'station'],'station.station_id=em.station_id')
+            ->join(['region'=>'r'],'station.area_id = r.id')
             ->where($map)
             ->count();
         return $data;