diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java index d659159a..ab81cfd4 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java @@ -172,6 +172,11 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl rUI = userClient.userInfo(vo.getCheckUserId()); if (rUI != null && rUI.isSuccess() && rUI.getData().getUser() != null) { vo.setCheckUserRealName(rUI.getData().getUser().getRealName()); - } + }else{ + vo.setCheckUserRealName(""); } } { InspectionItem item = inspectionItemService.getById(vo.getItemId()); @@ -110,7 +113,13 @@ 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())); } }