diff --git a/viewsh-module-ops/viewsh-module-ops-server/src/main/java/com/viewsh/module/ops/controller/area/AreaDeviceController.java b/viewsh-module-ops/viewsh-module-ops-server/src/main/java/com/viewsh/module/ops/controller/area/AreaDeviceController.java
index 1156d65..afca56c 100644
--- a/viewsh-module-ops/viewsh-module-ops-server/src/main/java/com/viewsh/module/ops/controller/area/AreaDeviceController.java
+++ b/viewsh-module-ops/viewsh-module-ops-server/src/main/java/com/viewsh/module/ops/controller/area/AreaDeviceController.java
@@ -45,14 +45,21 @@ public class AreaDeviceController {
         return success(BeanUtils.toBean(relations, AreaDeviceDTO.class));
     }
 
-    @GetMapping("/{areaId}/devices")
-    @Operation(summary = "查询区域设备列表（按类型）")
-    public CommonResult<List<AreaDeviceDTO>> getDevicesByAreaAndType(
-            @PathVariable("areaId") Long areaId,
-            @RequestParam("relationType") String relationType) {
-        List<OpsAreaDeviceRelationDO> relations = areaDeviceService.listByAreaIdAndType(areaId, relationType);
-        return success(BeanUtils.toBean(relations, AreaDeviceDTO.class));
-    }
+    @GetMapping("/{areaId}/devices")
+    @Operation(summary = "查询区域设备列表（按类型）")
+    public CommonResult<List<AreaDeviceDTO>> getDevicesByAreaAndType(
+            @PathVariable("areaId") Long areaId,
+            @RequestParam(value = "relationType", required = false) String relationType) {
+        
+        List<OpsAreaDeviceRelationDO> relations;
+        if (relationType != null) {
+            relations = areaDeviceService.listByAreaIdAndType(areaId, relationType);
+        } else {
+            relations = areaDeviceService.listByAreaId(areaId);
+        }
+        
+        return success(BeanUtils.toBean(relations, AreaDeviceDTO.class));
+    }
 
     @GetMapping("/device/{deviceId}/relation")
     @Operation(summary = "查询设备的关联关系")