审核记录优化

app/admin/controller/Process.php

@@ -83,10 +83,10 @@ class Process extends Base
 
         $rs = Db::name("process_order")
             ->alias('a')
-            ->leftJoin('action_process b', 'b.order_type=a.order_type AND b.order_process=a.order_status')
+            ->leftJoin('action_process b', 'b.order_type=a.order_type AND b.order_process=a.action_process')
             ->where(["a.order_type" => $param['type']])
             ->order('a.id', 'asc')
-            ->field('a.id,a.action_uid,a.action_name,a.addtime,a.action_process,a.order_type,a.source,a.order_status,b.status_name');
+            ->field('a.id,a.action_uid,a.action_name,a.addtime,a.action_process,a.order_type,a.source,a.action_process,b.status_name');
         if (is_numeric($param['orderCode'])) $rs->where('a.order_id', $param['orderCode']);
         else $rs->where('a.order_code', $param['orderCode']);
 
@@ -107,7 +107,7 @@ class Process extends Base
 
             $data[$i + 1] = [
                 'status_name' => $value['status_name'],
-                'order_process' => $value['order_status']
+                'order_process' => $value['action_process']
             ];
 //            $value['order_process'] = isset($list[$value['action_process']]['order_process']) ? $list[$value['action_process']]['order_process'] : 0;
 //            $value['order_name'] = isset($list[$value['action_process']]['order_name']) ? $list[$value['action_process']]['order_name'] : '';