From d57a8117b1b36cc5bcc732795f242fe0400ef59f Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期四, 20 五月 2021 21:03:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComCvtServeServiceImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComCvtServeServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComCvtServeServiceImpl.java
index 9aac06d..c6d9062 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComCvtServeServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComCvtServeServiceImpl.java
@@ -175,7 +175,8 @@
}
Map<String, Long> businessMap = getBusinessMap(comCvtBusinessDOS);
List<String> errorInfo = new ArrayList<>();
- list.forEach(comCvtServeExcelVO -> {
+ int index = 2;
+ for (ComCvtServeExcelVO comCvtServeExcelVO:list) {
/**
* 便民服务分类存在 并且 便民服务商家 匹配上
*/
@@ -198,7 +199,7 @@
errorInfo.add(comCvtServeExcelVO.getBusinessName() +"导入失败: 便民服务商家不存在");
}
}
- });
+ }
boolean saveBatched = this.saveBatch(comCvtServeDOS);
if(saveBatched) {
if (comCvtServeDOS.size()>0 && errorInfo != null && errorInfo.size() > 0) {
--
Gitblit v1.7.1