diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemServiceImpl.java index c98de5b1..104dccc2 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemServiceImpl.java @@ -108,21 +108,31 @@ public class WorkPlanItemServiceImpl extends BaseServiceImpl list = wpItemDetailService.listVOByWorkPlanItemId(vo.getId()); - if(null == list || list.size() == 0){ - vo.setWpItemDetailList(new ArrayList<>()); - }else{ - vo.setWpItemDetailList(list); - } -// vo.setWpItemDetailList(wpItemDetailService.listVOByWorkPlanItemId(vo.getId())); - vo.setThicknessList(wpItemThicknessService.listThicknessByWorkPlanItemId(vo.getId())); + + if(vo.getItem() != null){ + List list = wpItemDetailService.listVOByWorkPlanItemId(vo.getId()); + if(null == list || list.size() == 0){ + vo.setWpItemDetailList(new ArrayList<>()); + }else{ + vo.setWpItemDetailList(list); } } + +// if (vo.getItem() != null && vo.getItem().getSpecialType() != null) { +// if (InspectionItemConst.SPECIAL_TYPE_THICK.equals(vo.getItem().getSpecialType()) || +// InspectionItemConst.SPECIAL_TYPE_HARD.equals(vo.getItem().getSpecialType()) || +// InspectionItemConst.SPECIAL_TYPE_SIZE.equals(vo.getItem().getSpecialType()) +// ) { +// List list = wpItemDetailService.listVOByWorkPlanItemId(vo.getId()); +// if(null == list || list.size() == 0){ +// vo.setWpItemDetailList(new ArrayList<>()); +// }else{ +// vo.setWpItemDetailList(list); +// } +//// vo.setWpItemDetailList(wpItemDetailService.listVOByWorkPlanItemId(vo.getId())); +// vo.setThicknessList(wpItemThicknessService.listThicknessByWorkPlanItemId(vo.getId())); +// } +// } } @Resource