From ce5ba36d094548ccaa9f0ad276ff6409a4be17d4 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 27 Sep 2023 18:37:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E4=B8=BA?=
 =?UTF-8?q?=E9=80=89=E6=95=B0=E6=8D=AE=E6=97=B6=E5=85=B3=E8=81=94=E5=B9=B3?=
 =?UTF-8?q?=E5=8F=B0=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProjectLawsInventoryEOServiceImpl.java   | 2 +-
 .../service/impl/ProjectLibraryBaseServiceImpl.java       | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
index 316f33b3b..889883d41 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
@@ -11677,7 +11677,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		return pageList;
 	}
 
-	private void platformDispose(ProjectLawsInventoryEO projectLawsInventoryEO, List<ProjectLawsInventoryEO> result) {
+	public void platformDispose(ProjectLawsInventoryEO projectLawsInventoryEO, List<ProjectLawsInventoryEO> result) {
 		List<String> valueList = FlowStateEnum.getValueInfo();
 		List<LawsInventoryPlatformEO> lawsInventoryPlatformEOList = new ArrayList<>();
 		List<ProjectLawsInventoryEO> projectLawsInventoryEOS = new ArrayList<>();
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
index e7288fcd9..cf2c10e3a 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
@@ -1449,11 +1449,14 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 		String cut = (String) params.get("cut");//
 		String projectLibraryIds = (String) params.get("projectLibraryIds");//法规清单id
 		String platformProjectLibraryIds = (String) params.get("platformProjectLibraryIds");//平台件法规id
-
 		//法规清单数据
 		LambdaQueryWrapper<ProjectLawsInventoryEO> wrapper = new LambdaQueryWrapper<>();
 		wrapper.in(ProjectLawsInventoryEO::getId,Arrays.asList(projectLibraryIds.split(",")));
 		List<ProjectLawsInventoryEO> lawsInventoryEOList = projectLawsInventoryEOService.list(wrapper);
+
+		ProjectLawsInventoryEO projectLawsInventoryEOTemp = new ProjectLawsInventoryEO();
+		projectLawsInventoryEOTemp.setCut(cut);
+		projectLawsInventoryEOService.platformDispose(projectLawsInventoryEOTemp,lawsInventoryEOList);
 		//只有法规的设计符合性确认和验证符合性确认中的流程状态均为清单待发布的时候，才能关联平台件数据
 		lawsInventoryEOList = lawsInventoryEOList.stream()
 				.filter(e->ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue().equals(e.getDesignFlowStatus())
@@ -1484,8 +1487,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 			//serialNumber dutyTerritory
 			String serialNumber = projectLawsInventoryEO.getSerialNumber();
 			String dutyTerritory = projectLawsInventoryEO.getDutyTerritory();
-			String subtitle = projectLawsInventoryEO.getSubtitle();
-
+			String subtitle = StringUtils.isNotEmpty(projectLawsInventoryEO.getSubtitle()) ? projectLawsInventoryEO.getSubtitle() : "";;
 			//责任领域
 			List<String> list = new LinkedList<>();
 			if(StringUtils.isNotBlank(dutyTerritory)){