From 7244fe0ab9d8760371226deddec6f5dc8e26bc03 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 26 Sep 2023 17:11:55 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95=E5=85=B3?= =?UTF-8?q?=E8=81=94=E5=B9=B3=E5=8F=B0=E4=BB=B6=E5=90=8E=EF=BC=8C=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E9=A1=B9=E5=B1=95=E7=A4=BA=E5=B9=B3=E5=8F=B0=E4=BB=B6?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...rojectCertificationInventoryEOServiceImpl.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) 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..ce0939d77 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()); + } } } }