From 22e8f5555ab36a021943ad5e5a90e602c4d659d4 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 29 四月 2022 10:34:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng' into huacheng
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComCvtServeServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 efb37c5..ff49f3d 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
@@ -204,7 +204,7 @@
ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
importErrorVO.setErrorMsg(String.format("导入失败：商家【%s】下已有服务【%s】",
comCvtServeExcelVO.getBusinessName(), comCvtServeExcelVO.getServiceName()));
- importErrorVO.setErrorPosition("第" + index + "行");
+// importErrorVO.setErrorPosition("第" + index + "行");
populationImportErrorVOList.add(importErrorVO);
log.error(String.format("导入失败：商家【%s】下已有服务【%s】", comCvtServeExcelVO.getBusinessName(),
comCvtServeExcelVO.getServiceName()));
@@ -213,14 +213,14 @@
if (!categoryMap.containsKey(comCvtServeExcelVO.getCategoryName())) {
ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
importErrorVO.setErrorMsg("导入失败: 服务分类" + comCvtServeExcelVO.getCategoryName() + "不存在");
- importErrorVO.setErrorPosition("第" + index + "行，第1列");
+// importErrorVO.setErrorPosition("第" + index + "行，第1列");
populationImportErrorVOList.add(importErrorVO);
// errorInfo.add(comCvtServeExcelVO.getCategoryName() +"导入失败: 服务分类不存在");
}
if (!businessMap.containsKey(comCvtServeExcelVO.getBusinessName())) {
ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
importErrorVO.setErrorMsg("导入失败: 便民服务商家" + comCvtServeExcelVO.getBusinessName() + "不存在");
- importErrorVO.setErrorPosition("第" + index + "行，第5列");
+// importErrorVO.setErrorPosition("第" + index + "行，第5列");
populationImportErrorVOList.add(importErrorVO);
}
}
--
Gitblit v1.7.1