|
@@ -263,7 +263,11 @@ class MessageService extends BaseService
|
|
|
|
|
|
|
|
if ($userId) {
|
|
if ($userId) {
|
|
|
$query->where(function ($query) use ($userId) {
|
|
$query->where(function ($query) use ($userId) {
|
|
|
- $query->where(['a.from_uid' => $userId,'a.from_show'=>1])->orWhere(['a.to_uid' => $userId,'a.to_show'=>1]);
|
|
|
|
|
|
|
+ $query->where(function($query) use($userId){
|
|
|
|
|
+ $query->where(['a.from_uid' => $userId,'a.from_show'=>1]);
|
|
|
|
|
+ })->orWhere(function($query) use($userId){
|
|
|
|
|
+ $query->where(['a.to_uid' => $userId,'a.to_show'=>1]);
|
|
|
|
|
+ });
|
|
|
});
|
|
});
|
|
|
}
|
|
}
|
|
|
})
|
|
})
|