WIN-2308041133\Administrator 3 days ago
parent
commit
7908b0384b
1 changed files with 9 additions and 2 deletions
  1. 9 2
      app/api/controller/User.php

+ 9 - 2
app/api/controller/User.php

@@ -1149,8 +1149,11 @@ class User extends BaseController
         $where=[];
 
         $totalCount = (new UserContractRecordModel)->where($where)->count();
-        $uid= $request->user["uid"];
-        var_dump($uid);die();
+        $uid = UtilService::getMore([
+            ['uid', 0],
+        ], $request);
+//        $uid= $request->user["uid"];
+//        var_dump($uid);die();
         if ($uid>0){
             $where[]=["uid","=",$uid];
         }
@@ -1165,6 +1168,10 @@ class User extends BaseController
 //                ->join("show_template t", "t.id = show_template_id","left")
                 ->where($where)
 //                ->order("is_default", "desc")
+                ->where(function($query) use ($uid) {
+                    $query->where('uid', $uid)
+                        ->orWhere('to_uid', $uid);
+                })
                 ->order("id", "desc")
                 ->page($post["page"], $post["pageSize"])
                 ->select();