|
@@ -155,13 +155,13 @@ class Message extends Api
|
|
}
|
|
}
|
|
}else{
|
|
}else{
|
|
$user = User::getByUserId($post['user_id']);
|
|
$user = User::getByUserId($post['user_id']);
|
|
- $wheres['m.group_id']=$user->group_id;
|
|
|
|
$wheres['m.status']=2;
|
|
$wheres['m.status']=2;
|
|
$user_id=$post['user_id'];
|
|
$user_id=$post['user_id'];
|
|
$list =Db::name('message')->alias('m')
|
|
$list =Db::name('message')->alias('m')
|
|
->field('m.id,mr.message_id')
|
|
->field('m.id,mr.message_id')
|
|
->join('message_read mr',"m.id =mr.message_id and mr.user_id='{$user_id}'",'left')
|
|
->join('message_read mr',"m.id =mr.message_id and mr.user_id='{$user_id}'",'left')
|
|
->where($wheres)
|
|
->where($wheres)
|
|
|
|
+ ->where("group_id=3 or group_id={$user->group_id}")
|
|
->select();
|
|
->select();
|
|
|
|
|
|
$res=array();
|
|
$res=array();
|