From d53d5f2a27966324a6bfaf7e8caf520f882c882d Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期五, 23 九月 2022 09:10:41 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/crm/manager/controller/CstmrController.java |    5 +++--
 1 files changed, 3 insertions(+), 2 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..c931a92 100644
--- a/src/main/java/com/zy/crm/manager/controller/CstmrController.java
+++ b/src/main/java/com/zy/crm/manager/controller/CstmrController.java
@@ -181,7 +181,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 +210,8 @@
             String uuid = dataFormatter.formatCellValue(row.getCell(0));
             if (!Cools.isEmpty(uuid)) {
                 if (cstmrService.selectByUuid(hostId, uuid) != null) {
-                    throw new CoolException(uuid + "瀹㈡埛浠e彿宸插瓨鍦紝璇烽噸鏂板鍏�");
+//                    throw new CoolException(uuid + "瀹㈡埛浠e彿宸插瓨鍦紝璇烽噸鏂板鍏�");
+                    continue;
                 } else {
                     cstmr.setUuid(uuid);
                 }

--
Gitblit v1.9.1