diff --git a/app/admin/controller/PostCommentController.php b/app/admin/controller/PostCommentController.php index 62b88c7..67cde1b 100644 --- a/app/admin/controller/PostCommentController.php +++ b/app/admin/controller/PostCommentController.php @@ -2,6 +2,9 @@ namespace app\admin\controller; use app\common\controller\BaseController; +use app\common\model\PostComment; +use app\common\model\User; +use app\common\service\OssService; use app\common\traits\crud\CrudControllerTrait; use app\common\service\PostCommentService; @@ -22,12 +25,38 @@ class PostCommentController extends BaseController * @param array $data * @return array */ - protected function indexFormat($data) - { - if (isset($data['created_at'])) - $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']); - if (isset($data['updated_at'])) - $data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']); - return $data; - } + protected function indexFormat($data) + { + if (isset($data['created_at'])) + $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']); + if (isset($data['updated_at'])) + $data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']); + if (isset($data['id'])){ + $data['child'] = []; + $child = PostComment::where(['parent_id' => $data['id']])->first(); + if(!empty($child)){ + $child = $child->toArray(); + } + $data['count'] = PostComment::where(['parent_id' => $data['id']])->count(); + if (isset($child['user_id'])){ + $ossservice = new OssService(); + $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']); + } + $child['created_at'] = date('Y-m-d H:i:s', strtotime($child['created_at'])); + $child['updated_at'] = date('Y-m-d H:i:s', strtotime($child['updated_at'])); + $data['child'][] = $child; + } + } + if (isset($data['user_id'])){ + $ossservice = new OssService(); + $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']); + } + } + return $data; + } } \ No newline at end of file