test

application/em/model/EmInvoice.php

@@ -87,12 +87,13 @@ class EmInvoice extends Base
         $data = self::alias('inv')
             ->field('inv.*')
             ->field('station.station_name')
-            ->field('em.em_numb')
+            ->field('em.em_numb,em.em_type_id')
             ->join(['em_account'=>'ea'],'ea.account_id = inv.account_id')
             ->join(['em'],'em.id=ea.em_id')
             ->join(['station_info'=>'station'],'station.station_id=em.station_id')
             ->where(['inv.invoice_id'=>$ids])
-//            ->where('inv.payment_balance','neq',0)
+            ->whereNotIn('em.em_type_id','2,4')
+            ->where('inv.payment_balance','neq',0)
             ->select();
         return $data;
     }