From fa7d999ace7025725433a1a609e7d469c71e6c29 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 07 十一月 2022 15:12:45 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/CstmrController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/CstmrController.java b/src/main/java/com/zy/crm/manager/controller/CstmrController.java
index dd2ba66..5c60c43 100644
--- a/src/main/java/com/zy/crm/manager/controller/CstmrController.java
+++ b/src/main/java/com/zy/crm/manager/controller/CstmrController.java
@@ -25,7 +25,6 @@
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -181,7 +180,7 @@
*/
@PostMapping(value = "/cstmr/excel/import/auth")
@ManagerAuth(memo = "鐢叉柟鍗曚綅Excel瀵煎叆")
- @Transactional
+// @Transactional
public R cstmrExcelImport(MultipartFile file) throws IOException {
InputStream inStream = file.getInputStream();
String fileMime = file.getContentType();
@@ -210,7 +209,8 @@
String uuid = dataFormatter.formatCellValue(row.getCell(0));
if (!Cools.isEmpty(uuid)) {
if (cstmrService.selectByUuid(hostId, uuid) != null) {
- throw new CoolException(uuid + "瀹㈡埛浠ｅ彿宸插瓨鍦紝璇烽噸鏂板鍏�");
+// throw new CoolException(uuid + "瀹㈡埛浠ｅ彿宸插瓨鍦紝璇烽噸鏂板鍏�");
+ continue;
} else {
cstmr.setUuid(uuid);
}
--
Gitblit v1.9.1