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 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) {