Merge remote-tracking branch 'origin/mssql' into mssql

src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryController.java

@@ -7,6 +7,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;
@@ -162,6 +163,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();
     }

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) {