From 02f18587bd8860b305e2c688e20465be166bb48c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 22 七月 2021 15:14:03 +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 | 3 ++-
1 files changed, 2 insertions(+), 1 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 04aa667..59bafa6 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
@@ -179,6 +179,7 @@
Map<String, Long> businessMap = getBusinessMap(comCvtBusinessDOS);
int index = 2;
for (ComCvtServeExcelVO comCvtServeExcelVO:list) {
+
/**
* 便民服务分类存在 并且 便民服务商家 匹配上
*/
@@ -217,7 +218,7 @@
boolean saveBatched = this.saveBatch(comCvtServeDOS);
if(saveBatched) {
if (comCvtServeDOS.size()>0 && populationImportErrorVOList.size() > 0) {
- return R.fail(populationImportErrorVOList.toString());
+ return R.fail(JSON.toJSONString(populationImportErrorVOList));
}
if(comCvtServeDOS.size()==0 && populationImportErrorVOList.size() > 0){
return R.fail(JSON.toJSONString(populationImportErrorVOList));
--
Gitblit v1.7.1