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 267c06211..a583167ed 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 @@ -1957,6 +1957,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl projectLibraryBaseList = new ArrayList<>(); List collect = lawsInventoryPlatformEOList.stream() .filter(e -> certificationInventoryEO.getId().equals(e.getLawsInventoryId())).collect(Collectors.toList()); if(ObjectUtils.isNotEmpty(collect)){ @@ -1966,6 +1967,15 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl inventoryEOList = projectCertificationInventoryEOS.stream() .filter(e -> platformLawsInventoryIdList.contains(e.getId())).collect(Collectors.toList()); certificationInventoryEO.setProjectCertificationInventoryEOS(inventoryEOList); + + if(ObjectUtils.isNotEmpty(inventoryEOList)){ + List projectLibraryIdList = inventoryEOList.stream() + .map(ProjectCertificationInventoryEO::getProjectLibraryId).distinct().collect(Collectors.toList()); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(ProjectLibraryBase::getId,projectLibraryIdList); + projectLibraryBaseList = projectLibraryBaseService.list(wrapper); + } + } @@ -1979,6 +1989,11 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl libraryBaseList = projectLibraryBaseList.stream() + .filter(e -> certificationInventoryEOS.get(0).getProjectLibraryId().equals(e.getId())).collect(Collectors.toList()); + if(ObjectUtils.isNotEmpty(libraryBaseList)){ + certificationInventoryEO.setConfigItem(libraryBaseList.get(0).getProjectNameId()); + } } } } @@ -7191,7 +7206,12 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl