From 1f8aa817127e3198a060cec3205e220ed8e586c0 Mon Sep 17 00:00:00 2001
From: ctexthuang <ctexthuang@qq.com>
Date: Fri, 28 Feb 2025 14:34:19 +0800
Subject: [PATCH] feat : site

---
 app/Service/Api/User/SiteService.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/Service/Api/User/SiteService.php b/app/Service/Api/User/SiteService.php
index cd7fab2..4b3638f 100644
--- a/app/Service/Api/User/SiteService.php
+++ b/app/Service/Api/User/SiteService.php
@@ -50,14 +50,15 @@ class SiteService extends BaseService
      */
     public function handle(): array
     {
-        $siteIds = $this->userSiteModel->where('user_id', $this->userId)->pluck('site_id')->toArray();
+        $siteIds = $this->userSiteModel->where('user_id', $this->userId)->select(['id','is_default'])->get();
 
-        $res = [];
-        foreach ($siteIds as $siteId) {
-            $res[] = $this->siteCache->getSiteInfo($siteId);
+        if (empty($siteIds)) $this->return->success('success', ['list' => []]);
+
+        foreach ($siteIds as &$siteId) {
+            $siteId = array_merge($siteId,$this->siteCache->getSiteInfo($siteId['id']));
         }
 
-        return $this->return->success('success', ['list' => $res]);
+        return $this->return->success('success', ['list' => $siteIds]);
     }
 
     /**