| xqd
@@ -239,7 +239,7 @@ class DreamController extends Controller
|
|
|
$arr = array_filter(explode(',',$interaction->black_list));
|
|
|
if(!empty($arr)){
|
|
|
$interaction->comments = CommentInfoModel::where('interaction_id',$interaction->id)->where(function ($query) use ($arr) {
|
|
|
- $query->whereNotIn('user_id',$arr);
|
|
|
+ $query->whereNotIn('user_id',$arr)->whereNotIn('to_user_id',$arr);
|
|
|
})->orderBy('created_at')->get()->toArray();
|
|
|
}else{
|
|
|
$interaction->comments = CommentInfoModel::where('interaction_id',$interaction->id)->orderBy('created_at')->get()->toArray();
|
| xqd
@@ -306,7 +306,7 @@ class DreamController extends Controller
|
|
|
$arr = array_filter(explode(',',$interaction->black_list));
|
|
|
if(!empty($arr)){
|
|
|
$interaction->comments = CommentInfoModel::where('interaction_id',$interaction->id)->where(function ($query) use ($arr) {
|
|
|
- $query->whereNotIn('user_id',$arr);
|
|
|
+ $query->whereNotIn('user_id',$arr)->whereNotIn('to_user_id',$arr);
|
|
|
})->orderBy('created_at')->get()->toArray();
|
|
|
}else{
|
|
|
$interaction->comments = CommentInfoModel::where('interaction_id',$interaction->id)->orderBy('created_at')->get()->toArray();
|