测试问题修改

@@ -102,8 +102,12 @@ class MemberController extends CommentController
                 $where_compare['l.status'] = $data['type'];
                 $where_compare['l.status'] = $data['type'];
                 $where_order['o.status'] = 6;
                 $where_order['o.status'] = 6;
             }else{
             }else{
+                if($data['type'] == 6){
+                    $where_order['o.status'] = array('in','6,10');
+                }else{
                     $where_order['o.status'] = $data['type'];
                     $where_order['o.status'] = $data['type'];
                 }
                 }
+            }
 
 
         }else{
         }else{
             $where_order['o.status'] = array('neq',9);
             $where_order['o.status'] = array('neq',9);
@@ -118,9 +122,6 @@ class MemberController extends CommentController
             ->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 ')
             ->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 ')
             ->order('o.create_time desc')
             ->order('o.create_time desc')
             ->select()->toArray();
             ->select()->toArray();
-        echo "<pre/>";
-        print_r($where_order);
-        die;
         if($coo_list){
         if($coo_list){
 //            查询分配表
 //            查询分配表
             $log = Db::name('CompareLog')->alias('l')
             $log = Db::name('CompareLog')->alias('l')