正在显示
1 个修改的文件
包含
5 行增加
和
4 行删除
@@ -102,7 +102,11 @@ class MemberController extends CommentController | @@ -102,7 +102,11 @@ class MemberController extends CommentController | ||
102 | $where_compare['l.status'] = $data['type']; | 102 | $where_compare['l.status'] = $data['type']; |
103 | $where_order['o.status'] = 6; | 103 | $where_order['o.status'] = 6; |
104 | }else{ | 104 | }else{ |
105 | - $where_order['o.status'] = $data['type']; | 105 | + if($data['type'] == 6){ |
106 | + $where_order['o.status'] = array('in','6,10'); | ||
107 | + }else{ | ||
108 | + $where_order['o.status'] = $data['type']; | ||
109 | + } | ||
106 | } | 110 | } |
107 | 111 | ||
108 | }else{ | 112 | }else{ |
@@ -118,9 +122,6 @@ class MemberController extends CommentController | @@ -118,9 +122,6 @@ class MemberController extends CommentController | ||
118 | ->field('h.id as hire_id,h.* , o.id as order_id,o.order_sn,o.status as orderStatus,o.create_time as cre,o.update_time as up , s.name as select_name ,m.name as member_name ') | 122 | ->field('h.id as hire_id,h.* , o.id as order_id,o.order_sn,o.status as orderStatus,o.create_time as cre,o.update_time as up , s.name as select_name ,m.name as member_name ') |
119 | ->order('o.create_time desc') | 123 | ->order('o.create_time desc') |
120 | ->select()->toArray(); | 124 | ->select()->toArray(); |
121 | - echo "<pre/>"; | ||
122 | - print_r($where_order); | ||
123 | - die; | ||
124 | if($coo_list){ | 125 | if($coo_list){ |
125 | // 查询分配表 | 126 | // 查询分配表 |
126 | $log = Db::name('CompareLog')->alias('l') | 127 | $log = Db::name('CompareLog')->alias('l') |
-
请 注册 或 登录 后发表评论