导入下载错误数据excel

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itembasic/ItembasicServiceImpl.java

@@ -196,17 +196,18 @@ public class ItembasicServiceImpl implements ItembasicService {
             if(StrUtil.isNotEmpty(massage)){
                 massage.substring(0,massage.length()-1);
                 errorList.add(importItembasic);
-                return;
             }
-            // 判断如果不存在，在进行插入
-            ItembasicDO existItembasic = itembasicMapper.selectByCode(importItembasic.getCode());
-            if (existItembasic == null&& mode != 3) {
-                itembasicMapper.insert(ItembasicConvert.INSTANCE.convert(importItembasic));
-            }
-            else if (existItembasic != null && mode != 2) {// 如果存在，判断是否允许更新
-                ItembasicDO itembasicDO = ItembasicConvert.INSTANCE.convert(importItembasic);
-                itembasicDO.setId(existItembasic.getId());
-                itembasicMapper.updateById(itembasicDO);
+            if(errorList != null){
+                // 判断如果不存在，在进行插入
+                ItembasicDO existItembasic = itembasicMapper.selectByCode(importItembasic.getCode());
+                if (existItembasic == null&& mode != 3) {
+                    itembasicMapper.insert(ItembasicConvert.INSTANCE.convert(importItembasic));
+                }
+                else if (existItembasic != null && mode != 2) {// 如果存在，判断是否允许更新
+                    ItembasicDO itembasicDO = ItembasicConvert.INSTANCE.convert(importItembasic);
+                    itembasicDO.setId(existItembasic.getId());
+                    itembasicMapper.updateById(itembasicDO);
+                }
             }
         });
         //错误不为空并非部分更新，手工回滚