diff --git a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialSwitchOtherCollectDataMapper.xml b/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialSwitchOtherCollectDataMapper.xml
index 7ee8304..67adb1c 100644
--- a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialSwitchOtherCollectDataMapper.xml
+++ b/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialSwitchOtherCollectDataMapper.xml
@@ -94,12 +94,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             MAX(CASE WHEN t.collect_type = 'entPhysicalName' THEN t.collect_value END) as entPhysicalName,
             MAX(CASE WHEN t.collect_type = 'entPhysicalSoftwareRev' THEN t.collect_value END) as entPhysicalSoftwareRev
         FROM `initial_switch_other_collect_data` t
-                 LEFT JOIN (
-            SELECT client_id, MAX(create_time) as max_time
+                 INNER JOIN (
+            SELECT collect_type, MAX(create_time) as max_time
             FROM `initial_switch_other_collect_data`
             WHERE client_id = #{clientId}
-            GROUP BY client_id
-        ) latest ON t.client_id = latest.client_id AND t.create_time = latest.max_time
+            GROUP BY collect_type
+        ) latest ON t.collect_type = latest.collect_type AND t.create_time = latest.max_time
         WHERE t.client_id = #{clientId}
     </select>
 </mapper>
\ No newline at end of file
diff --git a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialSystemOtherCollectDataMapper.xml b/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialSystemOtherCollectDataMapper.xml
index 503a9ac..93626e6 100644
--- a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialSystemOtherCollectDataMapper.xml
+++ b/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialSystemOtherCollectDataMapper.xml
@@ -93,12 +93,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             MAX(CASE WHEN t.collect_type = 'systemLocaltimeCollect' THEN t.collect_value END) as systemLocaltimeCollect,
             MAX(CASE WHEN t.collect_type = 'systemUptimeCollect' THEN t.collect_value END) as systemUptimeCollect
         FROM `initial_system_other_collect_data` t
-                 LEFT JOIN (
-            SELECT client_id, MAX(create_time) as max_time
+                 INNER JOIN (
+            SELECT collect_type, MAX(create_time) as max_time
             FROM `initial_system_other_collect_data`
             WHERE client_id = #{clientId}
-            GROUP BY client_id
-        ) latest ON t.client_id = latest.client_id AND t.create_time = latest.max_time
+            GROUP BY collect_type
+        ) latest ON t.collect_type = latest.collect_type AND t.create_time = latest.max_time
         WHERE t.client_id = #{clientId}
     </select>
 </mapper>
\ No newline at end of file