From 09d8c12ec5475a35da5c19af0a49ceff6d4be29b Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Thu, 6 Mar 2025 20:02:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bsd/pjcloud/hard/controller/order/HardCarController.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardCarController.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardCarController.java
index 841f2c9b5..1ad5dadcc 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardCarController.java
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardCarController.java
@@ -78,8 +78,11 @@ public class HardCarController {
     @GetMapping("/order-id")
     @Operation(summary = "根据订单id查询购物车")
     public R<Page<HardCarVo>> orderId(@ParameterObject Page page, @RequestParam Long orderId) {
+        if (ObjectUtil.isEmpty(orderId)) {
+            R.ok(null);
+        }
         HardOrderEntity order = hardOrderService.getById(orderId);
-        if (ObjectUtil.isEmpty(order)) return null;
+        if (ObjectUtil.isEmpty(order) || ObjectUtil.isEmpty(order.getParentCarId())) return null;
         HardCarDto dto = new HardCarDto();
         dto.setParentCarId(order.getParentCarId());
         return R.ok(hardCarService.pageJoin(page, dto));