test

application/em/model/EmPayment.php

@@ -37,15 +37,10 @@ class EmPayment extends Base
             ->leftJoin(['region'=>'r'],'station.area_id = r.id')
             ->where($map)
             ->order('pay.id desc')
+            ->group('pay.payment_id')
             ->page($Nowpage, $limits)
             ->select()
             ->toarray();
-        $payArr = [];
-        foreach ($data as $v){
-            $payArr[] = $v['payment_id'];
-        }
-
-
 
         $data2 = self::alias('pay')
             ->field('pay.*')
@@ -55,19 +50,13 @@ class EmPayment extends Base
             ->leftJoin(['station_info'=>'station'],'station.station_id=em.station_id')
             ->leftJoin(['region'=>'r'],'station.area_id = r.id')
             ->where($map)
-            ->whereNotIn('pay.payment_id',$payArr)
             ->order('pay.id desc')
+            ->group('pay.payment_id')
             ->page($Nowpage, $limits)
             ->select()
             ->toarray();
 
 
-        echo "<pre>";
-        echo "data".'<br>';
-        var_dump($data);
-        echo "payarr".'<br>';
-        var_dump($payArr);
-        dd($data2);
         $data = array_merge($data,$data2);
 
         $sortKey = [];