diff --git a/app/common/controller/MessageNoticeController.php b/app/common/controller/MessageNoticeController.php index 9ffe4ad..d84b428 100644 --- a/app/common/controller/MessageNoticeController.php +++ b/app/common/controller/MessageNoticeController.php @@ -58,7 +58,7 @@ class MessageNoticeController extends BaseController } if (isset($data['sender_user_id'])){ $ossservice = new OssService(); - $data['sender_user'] = User::where('id', $data['sender_user_id'])->select(['name', 'avatar', 'openid'])->first(); + $data['sender_user'] = User::where('id', $data['sender_user_id'])->select(['nickname', 'avatar', 'openid'])->first(); if(!str_contains($data['sender_user']['avatar'], 'http') && !empty($data['sender_user']['avatar'])){ $data['sender_user']['avatar_pull'] = $ossservice->generatePrivateUrl($data['sender_user']['avatar']); diff --git a/app/common/controller/PostCommentController.php b/app/common/controller/PostCommentController.php index b9a174a..8a52b63 100644 --- a/app/common/controller/PostCommentController.php +++ b/app/common/controller/PostCommentController.php @@ -33,12 +33,12 @@ class PostCommentController extends BaseController if (isset($data['updated_at'])) $data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']); if (isset($data['id'])){ - $data['reply']['child'] = PostComment::where(['parent_id' => $data['id']])->first(); - $data['reply']['count'] = PostComment::where(['parent_id' => $data['id']])->count(); + $data['child'][] = PostComment::where(['parent_id' => $data['id']])->first(); + $data['count'] = PostComment::where(['parent_id' => $data['id']])->count(); $child = $data['reply']['child']; if (isset($child['user_id'])){ $ossservice = new OssService(); - $child['user'] = User::where('id', $child['user_id'])->select(['name', 'avatar', 'openid'])->first(); + $child['user'] = User::where('id', $child['user_id'])->select(['nickname', 'avatar', 'openid'])->first(); if(!str_contains($child['user']['avatar'], 'http') && !empty($child['user']['avatar'])){ $child['user']['avatar_pull'] = $ossservice->generatePrivateUrl($child['user']['avatar']); } @@ -47,7 +47,7 @@ class PostCommentController extends BaseController } if (isset($data['user_id'])){ $ossservice = new OssService(); - $data['user'] = User::where('id', $data['user_id'])->select(['name', 'avatar', 'openid'])->first(); + $data['user'] = User::where('id', $data['user_id'])->select(['nickname', 'avatar', 'openid'])->first(); if(!str_contains($data['user']['avatar'], 'http') && !empty($data['user']['avatar'])){ $data['user']['avatar_pull'] = $ossservice->generatePrivateUrl($data['user']['avatar']);