咨询订单列表

app/Http/Controllers/Api/AskController.php

@@ -541,14 +541,6 @@ class AskController extends BaseController
             $where[] = ['ask_order.question','like','%'.$keyword.'%'];
         }
 
-        //如果登录了
-        if(($request->uid && $request->uid > 0) && ($request->uid == $user_id || $request->uid == $blogger_user_id)){
-            $where[] = ['ask_order.status','IN',[10,15,20]];
-        }else{
-            $where[] = ['ask_order.status','=',20];
-            $where[] = ['ask_order.is_public','=',1];
-        }
-
         //
         $list = DB::table('ask_order')
             ->leftJoin('wx_user as user','user.id','=','ask_order.user_id')
@@ -556,9 +548,19 @@ class AskController extends BaseController
             ->leftJoin('blogger','blogger.user_id','=','ask_order.blogger_user_id')
             ->select('ask_order.*','user.user_avatar','user.user_name','buser.user_avatar as blogger_avatar','buser.user_name as blogger_name','blogger.info as blogger_info')
             ->offset($offset)->limit($limit)
-            ->where($where)
-            ->orderBy('ask_order.id','desc')
-            ->get();
+            ->where($where);
+
+        //如果登录了
+        if(($request->uid && $request->uid > 0) && ($request->uid == $user_id || $request->uid == $blogger_user_id)){
+            $list = $list->whereIn('ask_order.status',[10,15,20]);
+        }else{
+            $list = $list->where([
+                ['ask_order.status','=',20],
+                ['ask_order.is_public','=',1]
+            ]);
+        }
+
+        $list = $list->orderBy('ask_order.id','desc')->get();
         $list = json_decode(json_encode($list),true);
 
         foreach($list as &$val){