diff --git a/src/views/login/log.js b/src/views/login/log.js
index 125f150..42992d6 100644
--- a/src/views/login/log.js
+++ b/src/views/login/log.js
@@ -29,15 +29,21 @@ export function useRepositories (api_type = 'my') {
     const res = await apis[api_type].list(listQuery).catch(_ => false)
     listRes.loading = false
     if (res) {
-      const uuids = res.data.list.filter(item => item.uuid).map(item => item.uuid)
-      const peers = await apis[api_type].fetchPeers({ uuids }).catch(_ => false)
-      if (peers?.data?.list) {
-        res.data.list.forEach(item => {
-          if (item.uuid) {
-            item.peer = peers.data.list.find(peer => peer.uuid === item.uuid)
-          }
-        })
+      //通过uuid补全peer信息
+      const uuids = res.data.list.filter(item => item.uuid&&item.client==='client'&&!item.device_id).map(item => item.uuid)
+      if(uuids.length > 0){
+        //uuids去重
+        const uniqueUuids = [...new Set(uuids)]
+        const peers = await apis[api_type].fetchPeers({ uuids: uniqueUuids }).catch(_ => false)
+        if (peers?.data?.list) {
+          res.data.list.forEach(item => {
+            if (item.uuid) {
+              item.peer = peers.data.list.find(peer => peer.uuid === item.uuid)
+            }
+          })
+        }
       }
+
       listRes.list = res.data.list
       listRes.total = res.data.total
     }
diff --git a/src/views/login/log.vue b/src/views/login/log.vue
index 927fab6..806f1de 100644
--- a/src/views/login/log.vue
+++ b/src/views/login/log.vue
@@ -28,7 +28,11 @@
           </template>
         </el-table-column>
         <el-table-column prop="client" label="client" align="center" width="120"/>
-        <el-table-column prop="peer.id" :label="T('Peer')" align="center"/>
+        <el-table-column prop="peer.id" :label="T('Peer')" align="center">
+          <template #default="{row}">
+            {{ row.device_id ? row.device_id : peer?.id }}
+          </template>
+        </el-table-column>
         <el-table-column prop="uuid" label="uuid" align="center"/>
         <el-table-column prop="ip" label="ip" align="center" width="150"/>
         <el-table-column prop="type" label="type" align="center" width="100"/>
diff --git a/src/views/my/login_log/index.vue b/src/views/my/login_log/index.vue
index 4de89ed..dc4e4fc 100644
--- a/src/views/my/login_log/index.vue
+++ b/src/views/my/login_log/index.vue
@@ -12,7 +12,11 @@
       <el-table :data="listRes.list" v-loading="listRes.loading" border @selection-change="handleSelectionChange">
         <el-table-column type="selection" align="center" width="50"/>
         <el-table-column prop="client" label="client" align="center" width="120"/>
-        <el-table-column prop="peer.id" :label="T('Peer')" align="center"/>
+        <el-table-column prop="peer.id" :label="T('Peer')" align="center">
+          <template #default="{row}">
+            {{ row.device_id ? row.device_id : peer?.id }}
+          </template>
+        </el-table-column>
         <el-table-column prop="uuid" label="uuid" align="center"/>
         <el-table-column prop="ip" label="ip" align="center" width="150"/>
         <el-table-column prop="type" label="type" align="center" width="100"/>