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 46302ea57..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")); @@ -3144,7 +3144,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl", "").replaceAll("", ""); //您订阅的XXX已被修改 String contentInfo = "In the " + technologyTerritoryNameEn + " technical field you subscribed to," +sysUser.getUsername()+" changed the "+ href + " " + sbStr.toString(); - String msgTitle = "The" + technologyTerritoryNameEn + "technical field you subscribed to has been updated"; + String msgTitle = "The " + technologyTerritoryNameEn + " technical field you subscribed to has been updated"; // 封装消息的实体类 SysAnnouncement sysAnnouncement = getSysAnnouncement(userList, msgTitle, contentInfoFei, contentInfo,MessageTypeEnum.READ.getValue(),MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName()); sysAnnouncementService.saveAnnouncement(sysAnnouncement); @@ -3166,7 +3166,7 @@ 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); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java index 9c60e01fc..66e03ed80 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java @@ -265,7 +265,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl + + + + {{text}} + + {{record.designDeliverableTypeName}}