gx

@@ -20,11 +20,11 @@ class MailController extends BaseController
     public function lists(){
     public function lists(){
         $mailModel = new MailModel();
         $mailModel = new MailModel();
         //获取当前用户下的所有站内信
         //获取当前用户下的所有站内信
-        $lists = $mailModel->where('status',0)
+        $lists = $mailModel->where('status',0)->where($this->map)
             ->where('user_list','like','%,'.$this->uid.',%')
             ->where('user_list','like','%,'.$this->uid.',%')
             ->orWhere('user_list', '')
             ->orWhere('user_list', '')
             ->select(['*'])->orderBy($this->order,'desc')
             ->select(['*'])->orderBy($this->order,'desc')
-            ->paginate($this->row = 10000, ['*'], 'page', $this->page);
+            ->paginate($this->row, ['*'], 'page', $this->page);
         if(!empty($lists)){
         if(!empty($lists)){
             $lists = $lists->toArray();
             $lists = $lists->toArray();
         }
         }