From e54dfb30b8e4d5d214167afb191dcf087cb38465 Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Thu, 24 Oct 2024 16:46:56 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/yxt/goods/biz/goodsspu/GoodsSpuService.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuService.java b/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuService.java
index fd37e83..c9d339d 100644
--- a/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuService.java
+++ b/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuService.java
@@ -144,9 +144,14 @@ public class GoodsSpuService extends MybatisBaseService<GoodsSpuMapper, GoodsSpu
                 return rb.setMsg("商品编码重复");
             }
             for (GoodsSkuDto baseGoodsSkus : dto.getBaseGoodsSkus()) {
+                if(StringUtils.isBlank(baseGoodsSkus.getGoodsSkuCode())){
+                    return rb.setMsg("商品sku编码不能为空");
+                }
                 GoodsSku sku=goodsSkuService.getOne(new QueryWrapper<GoodsSku>().eq("goodsSkuCode",baseGoodsSkus.getGoodsSkuCode()));
-                if(!baseGoodsSkus.getSid().equals(sku.getSid())){
-                    return rb.setMsg("商品sku编码重复");
+                if(sku!=null){
+                    if(!baseGoodsSkus.getSid().equals(sku.getSid())){
+                        return rb.setMsg("商品sku编码重复");
+                    }
                 }
             }
             sid = dto.getSid();