| xqd
@@ -36,9 +36,13 @@ class MessageController extends Controller
|
|
|
$list = $query->paginate();
|
|
|
foreach ($list as $key=>$val){
|
|
|
$user = UserInfoModel::find($val->user_id);
|
|
|
- $mark = MapLandmarkModel::where('id',1)->first();
|
|
|
- $val->mark = $mark->title;
|
|
|
- $val->user = $user->nickname;
|
|
|
+ $mark = MapLandmarkModel::where('id',$val->mark_id)->first();
|
|
|
+ if($mark){
|
|
|
+ $val->mark = $mark->title;
|
|
|
+ $val->user = $user->nickname;
|
|
|
+ }else{
|
|
|
+ unset($list[$key]);
|
|
|
+ }
|
|
|
}
|
|
|
return view('admin.map.message.index',compact('list'));
|
|
|
}
|