diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java index c1f931bd8..a7601051c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java @@ -391,11 +391,11 @@ public class ProjectCertificationInventoryEOController extends JeroController connectPlatform(String id,String cut) { - ProjectCertificationInventoryEO projectCertificationInventoryEO = projectCertificationInventoryEOService.connectPlatform(id,cut); - if(projectCertificationInventoryEO==null) { + List projectCertificationInventoryEOList = projectCertificationInventoryEOService.connectPlatform(id,cut); + if(projectCertificationInventoryEOList==null) { return Result.error("未找到对应数据"); } - return Result.OK(projectCertificationInventoryEO); + return Result.OK(projectCertificationInventoryEOList); } } 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 ac71eb7d0..fa799af82 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 @@ -346,5 +346,5 @@ public interface IProjectCertificationInventoryEOService extends IService params); - ProjectCertificationInventoryEO connectPlatform(String id,String cut); + List connectPlatform(String id,String cut); } 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 c8efaa9ce..6e8eb8ba6 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 @@ -7466,13 +7466,13 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl connectPlatform(String id,String cut) { //认证清单平台件关联表 LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.in(LawsInventoryPlatformEO::getLawsInventoryId,id); List lawsInventoryPlatformEOList = lawsInventoryPlatformEOService.list(wrapper); if(ObjectUtils.isEmpty(lawsInventoryPlatformEOList)){ - return new ProjectCertificationInventoryEO(); + return new ArrayList<>(); } ProjectCertificationInventoryEO certificationInventoryEO = projectCertificationInventoryEOService.queryById(lawsInventoryPlatformEOList.get(0).getLawsInventoryId()); @@ -7502,7 +7502,9 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl projectCertificationInventoryEOList = new ArrayList<>(); + projectCertificationInventoryEOList.add(certificationInventoryEO); + return projectCertificationInventoryEOList; }