From dd6173648806139f7bbecb4d96187544e40ba848 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9F=B3=E6=B8=85=E7=88=BD?= <eison.icu@gmail.com>
Date: Sat, 10 May 2025 14:20:58 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=81=E5=9F=9F=E6=93=8D=E7=9B=98=E6=89=8B?=
 =?UTF-8?q?=20-=20=E4=BF=AE=E5=A4=8D=E5=BE=AE=E4=BF=A1=E5=8F=B7=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E8=BF=9B=E5=85=A5=E8=AE=BE=E5=A4=87=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E4=BC=A0=E5=8F=82=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Cunkebao/app/wechat-accounts/[id]/page.tsx        | 15 +++++++++++++--
 Cunkebao/app/wechat-accounts/page.tsx             |  3 ++-
 .../wechat/GetWechatsOnDevicesV1Controller.php    |  2 ++
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/Cunkebao/app/wechat-accounts/[id]/page.tsx b/Cunkebao/app/wechat-accounts/[id]/page.tsx
index 576a38c2..8df347b9 100644
--- a/Cunkebao/app/wechat-accounts/[id]/page.tsx
+++ b/Cunkebao/app/wechat-accounts/[id]/page.tsx
@@ -140,6 +140,7 @@ export default function WechatAccountDetailPage({ params }: { params: { id: stri
     status: "normal" | "abnormal";
     wechatId: string;
     deviceName: string;
+    deviceId?: string | number;
   } | null>(null)
 
   useEffect(() => {
@@ -594,9 +595,19 @@ export default function WechatAccountDetailPage({ params }: { params: { id: stri
                 </div>
                 <p className="text-sm text-gray-500 mt-1">微信号：{account.wechatId}</p>
                 <div className="flex gap-2 mt-2">
-                  <Button variant="outline" onClick={() => router.push(`/devices/${account.deviceId}`)}>
+                  <Button 
+                    variant="outline" 
+                    onClick={() => {
+                      // 优先使用 initialData.deviceId
+                      const targetDeviceId = initialData?.deviceId || account.deviceId;
+                      if (targetDeviceId) {
+                        // 保证 deviceId 是数字或字符串
+                        return router.push(`/devices/${targetDeviceId}`);
+                      }
+                    }}
+                  >
                     <Smartphone className="w-4 h-4 mr-2" />
-                    {account.deviceName}
+                    {account.deviceName || '未命名设备'}
                   </Button>
                   <Button variant="outline" onClick={handleTransferFriends}>
                     <UserPlus className="w-4 h-4 mr-2" />
diff --git a/Cunkebao/app/wechat-accounts/page.tsx b/Cunkebao/app/wechat-accounts/page.tsx
index d3a995f6..7975062c 100644
--- a/Cunkebao/app/wechat-accounts/page.tsx
+++ b/Cunkebao/app/wechat-accounts/page.tsx
@@ -76,7 +76,7 @@ export default function WechatAccountsPage() {
             deviceName: item.deviceMemo,
             lastActive: item.activeTime,
             maxDailyAdds: item.times,
-            deviceId: item.id.toString(),
+            deviceId: item.deviceId.toString(),
           };
           return account;
         });
@@ -264,6 +264,7 @@ export default function WechatAccountsPage() {
                     status: account.status,
                     wechatId: account.wechatId,
                     deviceName: account.deviceName,
+                    deviceId: account.deviceId,
                   }));
                   router.push(`/wechat-accounts/${account.id}?data=${accountData}`);
                 }}
diff --git a/Server/application/cunkebao/controller/wechat/GetWechatsOnDevicesV1Controller.php b/Server/application/cunkebao/controller/wechat/GetWechatsOnDevicesV1Controller.php
index 84e008fb..6f9cf715 100644
--- a/Server/application/cunkebao/controller/wechat/GetWechatsOnDevicesV1Controller.php
+++ b/Server/application/cunkebao/controller/wechat/GetWechatsOnDevicesV1Controller.php
@@ -200,8 +200,10 @@ class GetWechatsOnDevicesV1Controller extends BaseController
                 [
                     'w.id', 'w.nickname', 'w.avatar',
                     'CASE WHEN w.alias IS NULL OR w.alias = "" THEN w.wechatId ELSE w.alias END AS wechatId',
+                    'l.deviceId'
                 ]
             )
+            ->join('device_wechat_login l', 'w.wechatId = l.wechatId')
             ->order('w.id desc');
 
         foreach ($where as $key => $value) {