rakor
/
nflg_project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

非Q 的规则

This commit is contained in:
大米 2024-01-19 10:46:44 +08:00
parent 648c2166d6
commit 8d560d9b4a
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java
View File

@ -185,6 +185,9 @@ public class CheckEBomException {
return; return;
} }
for (BomNewEbomParentVO exItem : exceptionList) { for (BomNewEbomParentVO exItem : exceptionList) {
if(Objects.isNull(exItem.getLevelNo())){
continue;
}
List<String> parentByLevel = BomLevelUtil.getParentByLevel(exItem.getLevelNo()); List<String> parentByLevel = BomLevelUtil.getParentByLevel(exItem.getLevelNo());
List<BomNewEbomParentVO> warnList = allBomDetail.stream().filter(u -> !u.getVirtualPartType().equals(VirtualPackageTypeEnum.PRE_ASSEMBLY_PACKAGE.getValue()) && !u.getVirtualPartType().equals(VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE.getValue()) && u.getBomRowId() > 0 && parentByLevel.contains(u.getLevelNo()) && EBomExceptionStatusEnum.OK.equalsValue(u.getExceptionStatus())).collect(Collectors.toList()); List<BomNewEbomParentVO> warnList = allBomDetail.stream().filter(u -> !u.getVirtualPartType().equals(VirtualPackageTypeEnum.PRE_ASSEMBLY_PACKAGE.getValue()) && !u.getVirtualPartType().equals(VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE.getValue()) && u.getBomRowId() > 0 && parentByLevel.contains(u.getLevelNo()) && EBomExceptionStatusEnum.OK.equalsValue(u.getExceptionStatus())).collect(Collectors.toList());
for (BomNewEbomParentVO k :warnList) { for (BomNewEbomParentVO k :warnList) {

6
nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/exception/BaseGlobalExceptionHandle.java
View File

@ -132,5 +132,11 @@ public class BaseGlobalExceptionHandle {
return ResultVO.error(e.getBindingResult().getFieldError().getDefaultMessage()) ; return ResultVO.error(e.getBindingResult().getFieldError().getDefaultMessage()) ;
} }
@ExceptionHandler(NullPointerException.class)
public ResultVO<String> handleNullPointerException(NullPointerException ex) {
return ResultVO.error(STATE.Error, "系统错误,请联系管理员:"+ex.getMessage()) ;
}
} }