|
|
@@ -27,10 +27,10 @@ class Proorder extends Base
|
|
|
* if(!empty($role['write'])){
|
|
|
* $where[]=["a.action_uid","in",$role['write']];
|
|
|
* }
|
|
|
- * $count = Db::name('process_order')->alias("a")->leftJoin("workflow b","a.order_type=b.order_type and a.order_code=b.order_code")->where($where)->count();
|
|
|
+ * $count = Db::name('process_order')->alias("a")->leftJoin("workflow b","a.order_id=b.order_id and a.order_code=b.order_code")->where($where)->count();
|
|
|
* $total = ceil("$count/$size");
|
|
|
* $page = $page>$total ? $total:$page;
|
|
|
- * $list = Db::name('process_order')->alias("a")->leftJoin("workflow b","a.order_type=b.order_type and a.order_code=b.order_code")
|
|
|
+ * $list = Db::name('process_order')->alias("a")->leftJoin("workflow b","a.order_id=b.order_id and a.order_code=b.order_code")
|
|
|
* ->field("b.apply_id,b.apply_name,a.addtime,a.action_uid,a.action_name,a.order_status,a.action_status,a.order_type,a.action_process,a.order_code,a.order_id,a.id")
|
|
|
* ->where($where)->page($page,$size)->order("a.addtime desc")->select();
|
|
|
* $data=[];
|
|
|
@@ -99,7 +99,7 @@ class Proorder extends Base
|
|
|
$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_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")
|
|
|
+ ->leftJoin("workflow b", "a.order_type=b.order_type and a.order_id=b.order_id")
|
|
|
// ->page($page, $param['size'])
|
|
|
->order("a.addtime desc")
|
|
|
->select()
|
wufeng