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 list = this.list(); - if(list.size() != 0){ - List serialNumberList = list.stream().map(BussDocumentLibraryEO::getSerialNumber).collect(Collectors.toList()); - if(serialNumberList.contains(serialNumber)){ - throw new JeroBootException("编号已存在不能重复添加"); - } - } +// List list = this.list(); +// if(list.size() != 0){ +// List 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 serialNumberList = new ArrayList<>(); + if (mapList.size() != 0) { + for (Map map : mapList) { + serialNumberList.add(StringUtils.valueOf(map.get("serial_number"))); + } + } + List list = this.list(); + if(list.size() != 0){ + List serialNumberListTemp = list.stream() + .filter(e -> serialNumberList.contains(e.getSerialNumber())).collect(Collectors.toList()); + if(serialNumberListTemp.size() != 0){ + List 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 map : mapList) { this.addInfo(map);