diff --git a/admin/src/views/device/detail.vue b/admin/src/views/device/detail.vue
index 6dae8243..2d6be683 100644
--- a/admin/src/views/device/detail.vue
+++ b/admin/src/views/device/detail.vue
@@ -133,10 +133,10 @@ const getDetails = async () => {
             deviceData.device.status = res.status
             deviceData.device.is_online = res.is_online
             deviceData.device.is_bind = res.is_bind
-            deviceData.device.land_id = res.land_id
-            deviceData.device.land_title = res.land_title
-            deviceData.device.product_id = res.product_id
-            deviceData.device.product_name = res.product_name
+            deviceData.device.land_id = res.land_id == null ? '' : res.land_id
+            deviceData.device.land_title = res.land_title == null ? '' : res.land_title
+            deviceData.device.product_id = res.product_id == null ? '' : res.product_id
+            deviceData.device.product_name = res.product_name == null ? '' : res.product_name
             deviceData.monitor_item = res.monitor_item
         })
         .catch((err: any) => {
diff --git a/admin/src/views/device/index.vue b/admin/src/views/device/index.vue
index dbef2b22..e8819089 100644
--- a/admin/src/views/device/index.vue
+++ b/admin/src/views/device/index.vue
@@ -106,7 +106,6 @@
                             <dict-value :options="dictData.device_type" :value="row.type" />
                         </template>
                     </el-table-column>
-                    <el-table-column label="设备编码" width="120" prop="code" show-overflow-tooltip />
                     <el-table-column label="所属土地" width="200">
                         <template #default="{ row }">
                             <el-tag class="mr-2" type="info">ID: {{ row.land_id }}</el-tag>
@@ -119,6 +118,7 @@
                             <el-tag class="mr-2" type="info">名称: {{ row.product_name }}</el-tag>
                         </template>
                     </el-table-column>
+                    <el-table-column label="设备编码" width="120" prop="code" show-overflow-tooltip />
                     <el-table-column label="设备状态" width="100" align="center" prop="status">
     <template #default="{ row }">
         <dict-value :options="dictData.device_status" :value="row.status" />
diff --git a/admin/src/views/product/index.vue b/admin/src/views/product/index.vue
index 35c60199..25a35699 100644
--- a/admin/src/views/product/index.vue
+++ b/admin/src/views/product/index.vue
@@ -66,8 +66,8 @@
                             <el-tag class="mr-2" type="info">账户: {{ row.account }}</el-tag>
                         </template>
                     </el-table-column> -->
-                    <el-table-column label="产品编号" prop="code" show-overflow-tooltip />
                     <el-table-column label="产品名称" prop="name" show-overflow-tooltip />
+                    <el-table-column label="产品编号" prop="code" show-overflow-tooltip />
                     <el-table-column label="所属土地" width="200">
                         <template #default="{ row }">
                             <el-tag class="mr-2" type="info">ID: {{ row.land_id }}</el-tag>