From b4d3224898d50b8f1e30b5c8083a520743927282 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Mon, 14 Jul 2025 21:08:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xin
---
oying-system/src/main/java/com/oying/modules/pc/product/rest/ProductCustomerController.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/pc/product/rest/ProductCustomerController.java b/oying-system/src/main/java/com/oying/modules/pc/product/rest/ProductCustomerController.java
index 38a2427..000ecca 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/product/rest/ProductCustomerController.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/product/rest/ProductCustomerController.java
@@ -18,7 +18,6 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
-import org.springframework.beans.BeanUtils;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
@@ -75,6 +74,9 @@
/*@PreAuthorize("@el.check('merchant:product:byProductId')")*/
public ResponseEntity<?> getProductDetails(@PathVariable Long productId) {
Product product = productService.getById(productId);
+ if (ObjUtil.isEmpty(product)) {
+ return ResponseEntity.ok(R.success());
+ }
ProductCustomerView customerView = new ProductCustomerView();
BeanUtil.copyProperties(product, customerView);
if (ObjUtil.isNotEmpty(product)) {
--
Gitblit v1.9.3