From 22a8cf0fc39555be78a030d208215fa7f6ad6bc4 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期三, 28 四月 2021 10:34:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
index 5df49bf..27f2053 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
@@ -255,11 +255,16 @@
index++;
}
//如果有错误，返回错误
+ //暂时注释，等客户完成任务需要恢复
+ /*if(!populationImportErrorVOList.isEmpty()){
+ return R.fail(JSON.toJSONString(populationImportErrorVOList));
+ }
+ this.saveBatch(populationDOList);*/
+
+ this.saveBatch(populationDOList);
if(!populationImportErrorVOList.isEmpty()){
return R.fail(JSON.toJSONString(populationImportErrorVOList));
}
-
- this.saveBatch(populationDOList);
return R.ok("共计导入实有人口数量：" + populationDOList.size());
}
--
Gitblit v1.7.1