From 5e741db8bc0555850564345ad9ee019814ec00a8 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Mon, 11 Jul 2022 18:02:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93=E5=AF=BC=E5=85=A5--?=
 =?UTF-8?q?=E7=BC=96=E5=8F=B7=E9=AA=8C=E9=87=8D=E4=B8=94=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BussDocumentLibraryEOServiceImpl.java     | 35 +++++++++++++++----
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
index 763530ab2..3e8e82250 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
@@ -1571,13 +1571,13 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
             String serialNumber = StringUtils.valueOf(map.get("serial_number"));
             //String serialNumber = StringUtils.valueOf(map.get("serial_number"));
             //编码验重
-            List<BussDocumentLibraryEO> list = this.list();
-            if(list.size() != 0){
-                List<String> serialNumberList = list.stream().map(BussDocumentLibraryEO::getSerialNumber).collect(Collectors.toList());
-                if(serialNumberList.contains(serialNumber)){
-                    throw new JeroBootException("编号已存在不能重复添加");
-                }
-            }
+//            List<BussDocumentLibraryEO> list = this.list();
+//            if(list.size() != 0){
+//                List<String> serialNumberList = list.stream().map(BussDocumentLibraryEO::getSerialNumber).collect(Collectors.toList());
+//                if(serialNumberList.contains(serialNumber)){
+//                    throw new JeroBootException("编号已存在不能重复添加");
+//                }
+//            }
 
             SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
             String issueTime = (String) (map.get("issue_time"));
@@ -5453,6 +5453,27 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
             FileUnZip.deleteDir(saveDirectory);
             throw new JeroBootException(html);
         } else {
+            //验证重复的标准号
+            List<String> serialNumberList = new ArrayList<>();
+            if (mapList.size() != 0) {
+                for (Map<String, Object> map : mapList) {
+                    serialNumberList.add(StringUtils.valueOf(map.get("serial_number")));
+                }
+            }
+            List<BussDocumentLibraryEO> list = this.list();
+            if(list.size() != 0){
+                List<BussDocumentLibraryEO> serialNumberListTemp = list.stream()
+                        .filter(e -> serialNumberList.contains(e.getSerialNumber())).collect(Collectors.toList());
+                if(serialNumberListTemp.size() != 0){
+                    List<String> collect = serialNumberListTemp.stream().map(BussDocumentLibraryEO::getSerialNumber).distinct().collect(Collectors.toList());
+                    if(CutEnum.CN.getValue().equals(cut)){
+                        throw new JeroBootException(StringUtils.join(collect,",")+" 编号已存在不能重复添加");
+                    }else{
+                        throw new JeroBootException(StringUtils.join(collect,",")+" already exists and cannot be added again");
+                    }
+                }
+            }
+
             if (mapList.size() != 0) {
                 for (Map<String, Object> map : mapList) {
                     this.addInfo(map);