gx

@@ -22,7 +22,7 @@ class MailController extends BaseController
         $mailModel = new MailModel();
         $mailModel = new MailModel();
         //获取当前用户下的所有站内信
         //获取当前用户下的所有站内信
         $this->map['user_list'] = ['like','%,'.$this->uid.',%'];
         $this->map['user_list'] = ['like','%,'.$this->uid.',%'];
-        $this->map['status'] = $this::STATUS_ZERO;
+        $this->map['user_list'] = ['or',null];
         $lists = $mailModel->lists($this->map,$this->page,$this->row);
         $lists = $mailModel->lists($this->map,$this->page,$this->row);
         if(!empty($lists['list'])){
         if(!empty($lists['list'])){
             foreach ($lists['list'] as $k => $v){
             foreach ($lists['list'] as $k => $v){

@@ -179,6 +179,10 @@ class Base extends Model
                         // in查询 ['id'=>['in',[1,2,3]]]
                         // in查询 ['id'=>['in',[1,2,3]]]
                         $query->whereIn($k, $v[1]);
                         $query->whereIn($k, $v[1]);
                         break;
                         break;
+                    case 'or':
+                        // in查询 ['id'=>['in',[1,2,3]]]
+                        $query->orWhere($k, $v[1]);
+                        break;
                     case 'no in':
                     case 'no in':
                         // in查询 ['id'=>['not in',[1,2,3]]]
                         // in查询 ['id'=>['not in',[1,2,3]]]
                         $query->whereNotIn($k, $v[1]);
                         $query->whereNotIn($k, $v[1]);