diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceComponentController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceComponentController.java
index 43ddd772..d4bd80a2 100644
--- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceComponentController.java
+++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceComponentController.java
@@ -32,6 +32,7 @@ import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
 import java.time.LocalDateTime;
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -68,8 +69,15 @@ public class DeviceComponentController extends ControllerBase {
     @GetMapping("getModelPartList")
     @MethodInfoMark(value = "获取机型部件列表", menuName = "机型部件")
     public ApiResult<List<DeviceComponentDetailDTO>> getModelPartList(@RequestParam("deviceComponentId") Integer deviceComponentId){
-        List<DeviceComponentDetail> result = deviceComponentDetailService.lambdaQuery().eq(DeviceComponentDetail::getDeviceComponentId, deviceComponentId).list();
-        return ApiResult.success(Convert.toList(DeviceComponentDetailDTO.class,result));
+        if (deviceComponentId == null) {
+            throw new NflgException(STATE.ParamErr, "设备ID不能为空");
+        }
+        List<DeviceComponentDetail> result = deviceComponentDetailService.lambdaQuery()
+                .eq(DeviceComponentDetail::getDeviceComponentId, deviceComponentId)
+                .list();
+        return ApiResult.success(result != null ?
+                Convert.toList(DeviceComponentDetailDTO.class, result) :
+                Collections.emptyList());
     }
 
     /**