From 36fe985f2678ac30fd29036ad7415157493196dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com> Date: Thu, 6 Feb 2025 14:48:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=BA=E5=9E=8B=E9=83=A8=E4=BB=B6-=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/DeviceComponentController.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) 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> getModelPartList(@RequestParam("deviceComponentId") Integer deviceComponentId){ - List 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 result = deviceComponentDetailService.lambdaQuery() + .eq(DeviceComponentDetail::getDeviceComponentId, deviceComponentId) + .list(); + return ApiResult.success(result != null ? + Convert.toList(DeviceComponentDetailDTO.class, result) : + Collections.emptyList()); } /**