From 7cd46586a7b0d4c07a7a06e63eeb0c7d6f40e957 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Thu, 29 Dec 2022 17:02:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=B8=85=E5=8D=95-=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=A4=84=E7=90=86=E8=B4=A3=E4=BB=BB=E9=A2=86=E5=9F=9F?=
 =?UTF-8?q?=E7=A9=BA=E6=8C=87=E9=92=88=E5=A4=84=E7=90=86=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectTaskInventoryEOServiceImpl.java    | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java
index b722bc011..8b1839adf 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java
@@ -1605,10 +1605,12 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 				if(StringUtils.isNotEmpty(projectTaskInventoryEO.getDutyTerritory())){
 					List<SysDictItem> collect = dictItemList.stream()
 							.filter(dict -> StringUtils.equals(dict.getItemValue(), projectTaskInventoryEO.getDutyTerritory())).collect(Collectors.toList());
-					if(StringUtils.equals(cut,CutEnum.CN.getValue())){
-						projectTaskInventoryEO.setDutyTerritoryName(collect.get(0).getItemText());
-					}else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
-						projectTaskInventoryEO.setDutyTerritoryName(collect.get(0).getEnName());
+					if(CollectionUtils.isNotEmpty(collect)){
+						if(StringUtils.equals(cut,CutEnum.CN.getValue())){
+							projectTaskInventoryEO.setDutyTerritoryName(collect.get(0).getItemText());
+						}else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
+							projectTaskInventoryEO.setDutyTerritoryName(collect.get(0).getEnName());
+						}
 					}
 				}else{
 					projectTaskInventoryEO.setDutyTerritoryName("");
@@ -1617,10 +1619,12 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 				if(StringUtils.isNotEmpty(projectTaskInventoryEO.getCertificationProgress())){
 					List<SysDictItem> collect = certificationProgress.stream()
 							.filter(dict -> StringUtils.equals(dict.getItemValue(), projectTaskInventoryEO.getCertificationProgress())).collect(Collectors.toList());
-					if(StringUtils.equals(cut,CutEnum.CN.getValue())){
-						projectTaskInventoryEO.setCertificationProgressName(collect.get(0).getItemText());
-					}else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
-						projectTaskInventoryEO.setCertificationProgressName(collect.get(0).getEnName());
+					if(CollectionUtils.isNotEmpty(collect)){
+						if(StringUtils.equals(cut,CutEnum.CN.getValue())){
+							projectTaskInventoryEO.setCertificationProgressName(collect.get(0).getItemText());
+						}else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
+							projectTaskInventoryEO.setCertificationProgressName(collect.get(0).getEnName());
+						}
 					}
 				}else{
 					projectTaskInventoryEO.setCertificationProgressName("");