|
|
@@ -60,8 +60,9 @@ class Proorder extends Base
|
|
|
$query->whereFindInSet('roleid', $role['roleid']);
|
|
|
|
|
|
//本人id
|
|
|
- $user = GetUserInfo($param['token']);
|
|
|
- if (isset($user['data']['id'])) $query->whereOr('wait_id', $user['data']['id']);
|
|
|
+// $user = GetUserInfo($param['token']);
|
|
|
+ //if (isset($user['data']['id']))
|
|
|
+ $query->whereOr('wait_id', $this->uid);
|
|
|
});
|
|
|
|
|
|
if ($param['order_code'] != '') $db->whereLike("a.order_code", '%' . $param['order_code'] . '%');
|
|
|
@@ -161,7 +162,7 @@ class Proorder extends Base
|
|
|
$total = ceil($count / $param['size']);
|
|
|
$page = $param['page'] > $total ? $total : $param['page'];
|
|
|
$list = $db
|
|
|
- ->field("a.id,a.addtime,a.action_name,a.order_status,a.order_type,a.order_process,a.order_code,a.order_id,a.handle_user_list")
|
|
|
+ ->field("a.id,a.addtime,a.action_name,a.order_status,a.order_type,a.order_process,a.order_code,a.order_id,a.handle_user_list,b.apply_id,b.apply_name")
|
|
|
->page($page, $param['size'])
|
|
|
->order("a.addtime desc")
|
|
|
// ->append(['handle_user_list'])
|
