|
|
@@ -109,9 +109,8 @@ class Message extends Api
|
|
|
$size=$post['size'];
|
|
|
$data=array();
|
|
|
if($user){
|
|
|
- $wheres['group_id']=$user->group_id;
|
|
|
$wheres['status']=2;
|
|
|
- $list = Db::name('message')->where($wheres)->order('id')->paginate($size,'',$config);
|
|
|
+ $list = Db::name('message')->where($wheres)->where("group_id=3 or group_id={$user->group_id}")->order('id')->paginate($size,'',$config);
|
|
|
if($list){
|
|
|
foreach ($list as $k=>$v){
|
|
|
$data[$k]['message_id']=$v['id'];
|
