| xqd
@@ -10,6 +10,7 @@ use App\Http\Params\UserReportParam;
|
|
|
use App\Models\DynamicModel;
|
|
|
use App\Models\DynamicZanModel;
|
|
|
use App\Models\User;
|
|
|
+use App\Models\UserBlacklistModel;
|
|
|
use App\Models\UserReportModel;
|
|
|
use App\Models\UserVipLimit;
|
|
|
use Illuminate\Support\Facades\DB;
|
| xqd
@@ -131,8 +132,18 @@ class DynamicService
|
|
|
$dynamic = $dynamic->whereRaw('FIND_IN_SET(?,tag)',[$where['tag_id']]);
|
|
|
}
|
|
|
|
|
|
- $dynamic = $dynamic->whereHas('user',function($query)use($where){
|
|
|
- $query->where('is_distory',0)->select();
|
|
|
+ $dynamic = $dynamic->whereHas('user',function($query)use($where,$user){
|
|
|
+ if($user){
|
|
|
+ //不看拉黑用户
|
|
|
+ $black_list = UserBlacklistModel::query()->where('user_id',$user->id)->select(['black_id'])->get()->toArray();
|
|
|
+ $ids = array_column($black_list,'black_id');
|
|
|
+ $ids[]= $user->id;
|
|
|
+ $query = $query->where('is_distory',0)->whereNotIn('users.id',$ids);
|
|
|
+ }else{
|
|
|
+ $query->where('is_distory',0)->select();
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
});
|
|
|
|
|
|
$dynamic = $dynamic->orderByDesc('id')
|