WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

任务清单-查询处理责任领域空指针处理。

Browse Source
This commit is contained in:
wangzhijiang
2022-12-29 17:02:25 +08:00
parent ed5769428c
commit 7cd46586a7
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java
+12 -8
View File
@@ -1605,10 +1605,12 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
if(StringUtils.isNotEmpty(projectTaskInventoryEO.getDutyTerritory())){ if(StringUtils.isNotEmpty(projectTaskInventoryEO.getDutyTerritory())){
List<SysDictItem> collect = dictItemList.stream() List<SysDictItem> collect = dictItemList.stream()
.filter(dict -> StringUtils.equals(dict.getItemValue(), projectTaskInventoryEO.getDutyTerritory())).collect(Collectors.toList()); .filter(dict -> StringUtils.equals(dict.getItemValue(), projectTaskInventoryEO.getDutyTerritory())).collect(Collectors.toList());
if(StringUtils.equals(cut,CutEnum.CN.getValue())){ if(CollectionUtils.isNotEmpty(collect)){
projectTaskInventoryEO.setDutyTerritoryName(collect.get(0).getItemText()); if(StringUtils.equals(cut,CutEnum.CN.getValue())){
}else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ projectTaskInventoryEO.setDutyTerritoryName(collect.get(0).getItemText());
projectTaskInventoryEO.setDutyTerritoryName(collect.get(0).getEnName()); }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
projectTaskInventoryEO.setDutyTerritoryName(collect.get(0).getEnName());
}
} }
}else{ }else{
projectTaskInventoryEO.setDutyTerritoryName(""); projectTaskInventoryEO.setDutyTerritoryName("");
@@ -1617,10 +1619,12 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
if(StringUtils.isNotEmpty(projectTaskInventoryEO.getCertificationProgress())){ if(StringUtils.isNotEmpty(projectTaskInventoryEO.getCertificationProgress())){
List<SysDictItem> collect = certificationProgress.stream() List<SysDictItem> collect = certificationProgress.stream()
.filter(dict -> StringUtils.equals(dict.getItemValue(), projectTaskInventoryEO.getCertificationProgress())).collect(Collectors.toList()); .filter(dict -> StringUtils.equals(dict.getItemValue(), projectTaskInventoryEO.getCertificationProgress())).collect(Collectors.toList());
if(StringUtils.equals(cut,CutEnum.CN.getValue())){ if(CollectionUtils.isNotEmpty(collect)){
projectTaskInventoryEO.setCertificationProgressName(collect.get(0).getItemText()); if(StringUtils.equals(cut,CutEnum.CN.getValue())){
}else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ projectTaskInventoryEO.setCertificationProgressName(collect.get(0).getItemText());
projectTaskInventoryEO.setCertificationProgressName(collect.get(0).getEnName()); }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
projectTaskInventoryEO.setCertificationProgressName(collect.get(0).getEnName());
}
} }
}else{ }else{
projectTaskInventoryEO.setCertificationProgressName(""); projectTaskInventoryEO.setCertificationProgressName("");