1

app/api/controller/User.php

@@ -1153,14 +1153,16 @@ class User extends BaseController
 //        $uid= $request->user["uid"];
 //        var_dump($uid);die();
         $uid=$uid['uid'];
-        if ($uid>0){
-            $where[]=["uid","=",$uid];
-        }
+//        if ($uid>0){
+//            $where[]=["uid","=",$uid];
+//        }
         $totalCount = (new UserContractRecordModel)->where($where)
-            ->where(function($query) use ($uid) {
-            $query->where('uid', $uid)
-                ->whereOr('to_uid', $uid);
-        })->count();
+            ->when($uid > 0, function($query) use ($uid) {
+                $query->where(function($query) use ($uid) {
+                    $query->where('uid', $uid)
+                        ->whereOr('to_uid', $uid);
+                });
+            })->count();
 
         if ($post["status"]!=-2){
             $where[]=['status','=',$post["status"]];
@@ -1169,14 +1171,16 @@ class User extends BaseController
         if($totalCount>0){
             $data = (new UserContractRecordModel)
                 ->where($where)
-                ->where(function($query) use ($uid) {
-                    $query->where('uid', $uid)
-                        ->whereOr('to_uid', $uid);
+                ->when($uid > 0, function($query) use ($uid) {
+                    $query->where(function($query) use ($uid) {
+                        $query->where('uid', $uid)
+                            ->whereOr('to_uid', $uid);
+                    });
                 })
                 ->order("id", "desc")
                 ->page($post["page"], $post["pageSize"])
                 ->select();
-            var_dump((new UserContractRecordModel)->getLastSql());die();
+//            var_dump((new UserContractRecordModel)->getLastSql());die();
             foreach($data as $k=>$v){
                 $data[$k]["is_use"]      = 1;//是否已经购买或者可以使用
                 switch ($data[$k]["status"]){