From bac497ff10012836667aa5332dfad4fc8012d83c Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 7 Dec 2023 10:27:33 +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=E6=8C=89=E5=B9=B3=E5=8F=B0=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectCertificationInventoryEOController.java        | 6 +++---
 .../service/IProjectCertificationInventoryEOService.java  | 2 +-
 .../impl/ProjectCertificationInventoryEOServiceImpl.java  | 8 +++++---
 3 files changed, 9 insertions(+), 7 deletions(-)

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<Pr
 	 @ApiOperation(value="认证清单关联按平台件", notes="认证清单关联按平台件")
 	 @GetMapping(value = "/connectPlatform")
 	 public Result<?> connectPlatform(String id,String cut) {
-		 ProjectCertificationInventoryEO projectCertificationInventoryEO = projectCertificationInventoryEOService.connectPlatform(id,cut);
-		 if(projectCertificationInventoryEO==null) {
+		 List<ProjectCertificationInventoryEO> 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<Projec
 	 */
 	String listPlatform(Map<String, Object> params);
 
-	ProjectCertificationInventoryEO connectPlatform(String id,String cut);
+	List<ProjectCertificationInventoryEO> 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<Proj
 	 * @return
 	 */
 	@Override
-	public ProjectCertificationInventoryEO connectPlatform(String id,String cut) {
+	public List<ProjectCertificationInventoryEO> connectPlatform(String id,String cut) {
 		//认证清单平台件关联表
 		LambdaQueryWrapper<LawsInventoryPlatformEO> wrapper = new LambdaQueryWrapper<>();
 		wrapper.in(LawsInventoryPlatformEO::getLawsInventoryId,id);
 		List<LawsInventoryPlatformEO> 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<Proj
 			String projectName = projectLibraryBase.getPlatformType()+"-"+projectLibraryBase.getPower()+"-"+projectLibraryBase.getProducer()+"-"+targetMarket;
 			certificationInventoryEO.setProjectName(projectName);
 		}
-		return certificationInventoryEO;
+		List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList = new ArrayList<>();
+		projectCertificationInventoryEOList.add(certificationInventoryEO);
+		return projectCertificationInventoryEOList;
 	}