test

application/em/model/EmPayment.php

@@ -42,27 +42,27 @@ class EmPayment extends Base
             ->select()
             ->toarray();
 
-        $arr = [];
-        foreach ($data as $v){
-            $arr[] = $v['payment_id'];
-        }
-
-        $data2 = self::alias('pay')
-            ->field('pay.*')
-            ->field('em.em_numb,r.region_name,station.station_name')
-            ->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')
-            ->where($map)
-            ->whereNotIn('pay.payment_id',$arr)
-            ->order('pay.id desc')
-            ->group('pay.payment_id')
-            ->page($Nowpage, $limits)
-            ->select()
-            ->toarray();
-
-        $data = array_merge($data,$data2);
+//        $arr = [];
+//        foreach ($data as $v){
+//            $arr[] = $v['payment_id'];
+//        }
+//
+//        $data2 = self::alias('pay')
+//            ->field('pay.*')
+//            ->field('em.em_numb,r.region_name,station.station_name')
+//            ->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')
+//            ->where($map)
+//            ->whereNotIn('pay.payment_id',$arr)
+//            ->order('pay.id desc')
+//            ->group('pay.payment_id')
+//            ->page($Nowpage, $limits)
+//            ->select()
+//            ->toarray();
+//
+//        $data = array_merge($data,$data2);
 
         $sortKey = [];
         foreach ($data as $k=>$item){

config/admin.php

@@ -12,7 +12,7 @@ return [
     'files_dir' => './static/uploads/files',
     'search_area' => '1',   //1按部门搜索,2全局
     'order_per' =>'ZD',
-    'redis_host' => '192.168.1.22',
+    'redis_host' => '192.168.1.70',
     'redis_port' => 6379,
     'base_url' => 'http://oa-release.gonn.com.cn/'
 ];