From 05ebcccc2c8099c0252501fea0e1797e5a1361d2 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 15 七月 2020 10:59:46 +0800
Subject: [PATCH] Merge branches 'master' and 'xtyasrs' of https://gitee.com/luxiaotao1123/zy-asrs into xtyasrs

---
 src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcelListener.java |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcelListener.java b/src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcelListener.java
index c83f61c..4ef5683 100644
--- a/src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcelListener.java
+++ b/src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcelListener.java
@@ -63,15 +63,16 @@
             matCode.setAppeUser(this.userId);
             list.add(matCode);
             total ++;
-        }
-        // 杈惧埌BATCH_COUNT浜嗭紝闇�瑕佸幓瀛樺偍涓�娆℃暟鎹簱锛岄槻姝㈡暟鎹嚑涓囨潯鏁版嵁鍦ㄥ唴瀛橈紝瀹规槗OOM
-        if (list.size() >= BATCH_COUNT) {
             if (!matCodeService.insertBatch(list)) {
                 throw new CoolException("瀵煎叆鏁版嵁寮傚父");
             }
-            // 瀛樺偍瀹屾垚娓呯悊 list
-            list.clear();
         }
+        // 杈惧埌BATCH_COUNT浜嗭紝闇�瑕佸幓瀛樺偍涓�娆℃暟鎹簱锛岄槻姝㈡暟鎹嚑涓囨潯鏁版嵁鍦ㄥ唴瀛橈紝瀹规槗OOM
+//        if (list.size() >= BATCH_COUNT) {
+//
+//            // 瀛樺偍瀹屾垚娓呯悊 list
+//            list.clear();
+//        }
     }
 
     /**

--
Gitblit v1.9.1