diff --git a/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/mysql/area/OpsAreaDeviceRelationMapper.java b/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/mysql/area/OpsAreaDeviceRelationMapper.java
index 74f2d7a..f0c6c23 100644
--- a/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/mysql/area/OpsAreaDeviceRelationMapper.java
+++ b/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/mysql/area/OpsAreaDeviceRelationMapper.java
@@ -18,16 +18,20 @@ public interface OpsAreaDeviceRelationMapper extends BaseMapperX<OpsAreaDeviceRe
     /**
      * 根据区域ID和关联类型查询关联关系
      *
-     * @param areaId       区域ID
+     * @param areaId       区域ID（可为null，表示查询所有区域）
      * @param relationType 关联类型（TRAFFIC_COUNTER/BEACON/BADGE）
      * @return 关联关系列表
      */
     default List<OpsAreaDeviceRelationDO> selectListByAreaIdAndRelationType(Long areaId, String relationType) {
-        return selectList(new LambdaQueryWrapperX<OpsAreaDeviceRelationDO>()
-                .eq(OpsAreaDeviceRelationDO::getAreaId, areaId)
+        LambdaQueryWrapperX<OpsAreaDeviceRelationDO> wrapper = new LambdaQueryWrapperX<OpsAreaDeviceRelationDO>()
                 .eq(OpsAreaDeviceRelationDO::getRelationType, relationType)
-                .eq(OpsAreaDeviceRelationDO::getEnabled, true)
-                .orderByDesc(OpsAreaDeviceRelationDO::getCreateTime));
+                .eq(OpsAreaDeviceRelationDO::getEnabled, true);
+
+        if (areaId != null) {
+            wrapper.eq(OpsAreaDeviceRelationDO::getAreaId, areaId);
+        }
+
+        return selectList(wrapper.orderByDesc(OpsAreaDeviceRelationDO::getCreateTime));
     }
 
     /**