From d603c955ae458f3b27fcd8961d4db11fe3b53f3d Mon Sep 17 00:00:00 2001
From: 07 <15989082884@163.com>
Date: Mon, 5 Dec 2022 10:38:29 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=95=86=E5=93=81=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=B7=BB=E5=8A=A0=E7=BC=96=E7=A0=81=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/goods/controller/GoodsCategoryController.java   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryController.java b/src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryController.java
index bda2289e..ff8f967b 100644
--- a/src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryController.java
+++ b/src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryController.java
@@ -6,6 +6,7 @@ import com.qs.serve.common.model.dto.PageVo;
 import com.qs.serve.common.model.dto.R;
 import com.qs.serve.common.model.enums.BizType;
 import com.qs.serve.common.model.enums.SystemModule;
+import com.qs.serve.common.util.Assert;
 import com.qs.serve.common.util.CopierUtil;
 import com.qs.serve.common.util.PageUtil;
 import com.qs.serve.common.util.TreeUtil;
@@ -154,6 +155,11 @@ public class GoodsCategoryController {
     @SysLog(module = SystemModule.GOODS, title = "分类", biz = BizType.INSERT)
     @PreAuthorize("hasRole('goods:category:insert')")
     public R<?> save(@RequestBody @Valid GoodsCategory param){
+        LambdaQueryWrapper<GoodsCategory> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(GoodsCategory::getCode,param.getCode());
+        if(goodsCategoryService.count(lqw)>0){
+            Assert.throwEx("存在重复编码，不能新增！");
+        }
         goodsCategoryService.add(param);
         return R.ok();
     }

From fa48a7bbf5cb54bbdc00e13ba514d4230a748608 Mon Sep 17 00:00:00 2001
From: 07 <15989082884@163.com>
Date: Mon, 5 Dec 2022 17:29:23 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=AF=BC=E5=85=A5EXCEL=E6=8E=92=E9=99=A4?=
 =?UTF-8?q?=E2=80=9C=E2=80=9D=E7=A9=BA=E5=AD=97=E7=AC=A6=E4=B8=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../serve/modules/tbs/controller/TbsBudgetController.java   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetController.java
index 4900ba9a..c98fcb2d 100644
--- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetController.java
+++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetController.java
@@ -173,6 +173,12 @@ public class TbsBudgetController {
         List<TbsBudgetExcelBo> errorList = new ArrayList<>();
         for (int i = 0; i < budgetBo.getItems().size(); i++) {
             TbsBudgetExcelBo item = budgetBo.getItems().get(i);
+            item.setSkuCodes(item.getSkuCodes().stream().filter(a->StringUtils.isNotEmpty(a.trim())).collect(Collectors.toList()));
+            item.setSpuNames(item.getSpuNames().stream().filter(a->StringUtils.isNotEmpty(a.trim())).collect(Collectors.toList()));
+            item.setCategoryNames(item.getCategoryNames().stream().filter(a->StringUtils.isNotEmpty(a.trim())).collect(Collectors.toList()));
+            item.setSeriesNames(item.getSeriesNames().stream().filter(a->StringUtils.isNotEmpty(a.trim())).collect(Collectors.toList()));
+            item.setBrandNames(item.getBrandNames().stream().filter(a->StringUtils.isNotEmpty(a.trim())).collect(Collectors.toList()));
+
             try {
                 tbsBudgetService.modifyByExcel(item);
             } catch (BusinessException e) {