diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java index a9011b79f..08f3f68e5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java @@ -233,5 +233,5 @@ public interface IProjectCertificationInventoryEOService extends IService dataUniqueCheck(List projectCertificationInventoryEOList, String cut,List result); + List dataUniqueCheck(List projectCertificationInventoryEOList, String cut,List result,String projectLibraryId); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index 7503fdf02..076fee61b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -349,7 +349,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl saveDataList = this.dataUniqueCheck(projectCertificationInventoryEOList,cut,result); + List saveDataList = this.dataUniqueCheck(projectCertificationInventoryEOList,cut,result,projectLibraryId); if(CollectionUtils.isNotEmpty(saveDataList)){ this.saveBatch(saveDataList); @@ -499,10 +499,12 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl dataUniqueCheck(List projectCertificationInventoryEOList, String cut,List result) { + public List dataUniqueCheck(List projectCertificationInventoryEOList, String cut,List result,String projectLibraryId) { List pciSaveList = new ArrayList<>(); - List allDataList = this.list(); + QueryWrapper pciQueryWrap = new QueryWrapper<>(); + pciQueryWrap.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId,projectLibraryId); + List allDataList = this.list(pciQueryWrap); // 重复数据数组 List duplicateDataList = allDataList.stream().filter(data -> { boolean flag = false; @@ -2664,7 +2666,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl saveDataList = this.dataUniqueCheck(projectCertificationInventoryEOList, cut, result); + List saveDataList = this.dataUniqueCheck(projectCertificationInventoryEOList, cut, result, projectLibraryId); this.saveBatch(saveDataList); Date now = new Date();