Merge branch 'dev_wf' of wugg/phpstock into version1.5

app/admin/controller/Proorder.php

@@ -96,7 +96,7 @@ class Proorder extends Base
                 ->toArray();
 
             $list = ProcessWait::alias("a")
-                ->field("b.apply_id,b.apply_name,a.addtime,a.action_uid,a.action_name,a.order_status,a.order_type,a.order_process,a.order_code,a.order_id,a.id,a.order_process_finally")
+                ->field("b.apply_id,b.apply_name,a.addtime,a.action_uid,a.action_name,a.order_status,a.order_type,a.order_code,a.order_id,a.id,a.order_process_finally order_process")
                 ->whereIn('a.id', array_column($order_types, 'ids'))
                 ->leftJoin("workflow b", "a.order_type=b.order_type and a.order_code=b.order_code")
 //                ->page($page, $param['size'])
@@ -112,15 +112,15 @@ class Proorder extends Base
             $data = [];
             foreach ($list as $value) {
                 $var = Db::name("action_process")
-                    ->where(['order_type' => $value['order_type']])
-                    ->whereIn('order_process', [$value['order_process'], $value['order_process_finally']])
-//                    ->field("status_name,order_process,order_name,roleid")
-                    ->column('status_name,order_process,order_name,roleid', 'order_process');
-//                    ->find();
+                    ->where(['order_type' => $value['order_type'], 'order_process' => $value['order_process']])
+//                    ->whereIn('order_process', [$value['order_process'], $value['order_process_finally']])
+                    ->field("status_name,order_process,order_name,roleid")
+//                    ->column('status_name,order_process,order_name,roleid', 'order_process');
+                    ->findOrEmpty();
                 $value['process_name'] = isset($all_process[$value['order_type']]) ? $all_process[$value['order_type']] : '';
-                $value['order_name'] = $var[$value['order_process']]['order_name'];
-                $value['status_name'] = $var[$value['order_process']]['status_name'];
-                $value['order_process_finally_status_name'] = $var[$value['order_process_finally']]['status_name'] ?? '';
+                $value['order_name'] = $var['order_name'];
+                $value['status_name'] = $var['status_name'];
+//                $value['order_process_finally_status_name'] = $var[$value['order_process_finally']]['status_name'] ?? '';
                 $data[] = $value;
             }
             return app_show(0, "获取成功", ['count' => $count, 'list' => $data]);