From 3b574926b6f2e832a37c619cb1bf2275b97250d2 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 15 Sep 2023 11:11:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6-=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E5=90=88=E8=A7=84=E6=8A=A5=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...formProjectLawsInventoryEOServiceImpl.java | 33 +++++++++++--------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
index a4eb66f62..799273bdc 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
@@ -7618,27 +7618,34 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 		//对应 Subject
 		dataMap.put("SUBJECT", StringUtils.isNotEmpty(projectLawsInventoryEO.getTitle()) ? projectLawsInventoryEO.getTitle() : "");
 		//对应 Project
-		dataMap.put("PROJECT_NAME", StringUtils.isNotEmpty(projectNameInfoEO.getProjectName()) ? projectNameInfoEO.getProjectName() : "");
+		dataMap.put("PROJECT_NAME", StringUtils.isNotEmpty(projectLibraryBase.getProjectNameId()) ? projectLibraryBase.getProjectNameId() : "");
+//		dataMap.put("PROJECT_NAME", StringUtils.isNotEmpty(projectNameInfoEO.getProjectName()) ? projectNameInfoEO.getProjectName() : "");
 
 		List<SysDictItem> regionDictList = sysDictItemServiceImpl.selectItemsByDictCode("region");
 		String market = "";
 		if (StringUtils.equals(cut, CutEnum.CN.getValue())) {
-			market = regionDictList.stream()
-					.filter(e -> projectLibraryBase.getTargetMarket().contains(e.getItemValue()))
-					.map(SysDictItem::getItemText)
-					.collect(Collectors.joining(","));
+			if(StringUtils.isNotBlank(projectLibraryBase.getTargetMarket())){
+				market = regionDictList.stream()
+						.filter(e -> projectLibraryBase.getTargetMarket().contains(e.getItemValue()))
+						.map(SysDictItem::getItemText)
+						.collect(Collectors.joining(","));
+			}
 		} else if (StringUtils.equals(cut, CutEnum.EN.getValue())) {
-			market = regionDictList.stream()
-					.filter(e -> projectLibraryBase.getTargetMarket().contains(e.getItemValue()))
-					.map(SysDictItem::getEnName)
-					.collect(Collectors.joining(","));
+			if(StringUtils.isNotBlank(projectLibraryBase.getTargetMarket())){
+				market = regionDictList.stream()
+						.filter(e -> projectLibraryBase.getTargetMarket().contains(e.getItemValue()))
+						.map(SysDictItem::getEnName)
+						.collect(Collectors.joining(","));
+			}
 		}
 		//对应 Market
 		dataMap.put("MARKET", StringUtils.isNotEmpty(market) ? market : "");
-		//对应 nt 数字平台
-		dataMap.put("NT", StringUtils.isNotEmpty(projectNameInfoEO.getDigitalPlatform()) ? projectNameInfoEO.getDigitalPlatform() : "");
-		//对应 np 车型平台
-		dataMap.put("NP", StringUtils.isNotEmpty(projectNameInfoEO.getVehiclePlatform()) ? projectNameInfoEO.getVehiclePlatform() : "");
+		if(ObjectUtils.isNotEmpty(projectNameInfoEO)){
+			//对应 nt 数字平台
+			dataMap.put("NT", StringUtils.isNotEmpty(projectNameInfoEO.getDigitalPlatform()) ? projectNameInfoEO.getDigitalPlatform() : "");
+			//对应 np 车型平台
+			dataMap.put("NP", StringUtils.isNotEmpty(projectNameInfoEO.getVehiclePlatform()) ? projectNameInfoEO.getVehiclePlatform() : "");
+		}
 		String processEndTimeStr = "";
 		// 流程最后结束的时间
 		if (projectLawsInventoryEO.getProcessEndTime() != null) {