正在显示
1 个修改的文件
包含
8 行增加
和
4 行删除
| @@ -21,8 +21,10 @@ class MailController extends BaseController | @@ -21,8 +21,10 @@ class MailController extends BaseController | ||
| 21 | $mailModel = new MailModel(); | 21 | $mailModel = new MailModel(); |
| 22 | //获取当前用户下的所有站内信 | 22 | //获取当前用户下的所有站内信 |
| 23 | $lists = $mailModel->where('status',0) | 23 | $lists = $mailModel->where('status',0) |
| 24 | - ->where('user_list','like','%,'.$this->uid.',%')->orWhere('user_list', '')->select(['*'])->orderBy($this->order,'desc') | ||
| 25 | - ->paginate($this->row, ['*'], 'page', $this->page); | 24 | + ->where('user_list','like','%,'.$this->uid.',%') |
| 25 | + ->where('status',0) | ||
| 26 | + ->orWhere('user_list', '')->select(['*'])->orderBy($this->order,'desc') | ||
| 27 | + ->paginate($this->row = 10000, ['*'], 'page', $this->page); | ||
| 26 | if(!empty($lists)){ | 28 | if(!empty($lists)){ |
| 27 | $lists = $lists->toArray(); | 29 | $lists = $lists->toArray(); |
| 28 | } | 30 | } |
| @@ -42,6 +44,7 @@ class MailController extends BaseController | @@ -42,6 +44,7 @@ class MailController extends BaseController | ||
| 42 | * @time :2023/6/17 15:02 | 44 | * @time :2023/6/17 15:02 |
| 43 | */ | 45 | */ |
| 44 | public function verifyRead(&$mailUserModel,$list){ | 46 | public function verifyRead(&$mailUserModel,$list){ |
| 47 | + $data = []; | ||
| 45 | foreach ($list as $k => $v){ | 48 | foreach ($list as $k => $v){ |
| 46 | //获取用户已读还是未读 | 49 | //获取用户已读还是未读 |
| 47 | $info = $mailUserModel->read(['mail_id'=>$v['id'],'user_id'=>$this->uid]); | 50 | $info = $mailUserModel->read(['mail_id'=>$v['id'],'user_id'=>$this->uid]); |
| @@ -49,10 +52,11 @@ class MailController extends BaseController | @@ -49,10 +52,11 @@ class MailController extends BaseController | ||
| 49 | $v['read_status'] = $this::STATUS_ONE;// | 52 | $v['read_status'] = $this::STATUS_ONE;// |
| 50 | }else{ | 53 | }else{ |
| 51 | $v['read_status'] = $this::STATUS_ZERO; | 54 | $v['read_status'] = $this::STATUS_ZERO; |
| 55 | + $data[] = $v; | ||
| 52 | } | 56 | } |
| 53 | - $lists[$k] = $v; | 57 | + |
| 54 | } | 58 | } |
| 55 | - return $lists; | 59 | + return $data; |
| 56 | } | 60 | } |
| 57 | 61 | ||
| 58 | /** | 62 | /** |
-
请 注册 或 登录 后发表评论