gx

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