From 7f5c2cffe9a238c118b6b039359de6d18aabb277 Mon Sep 17 00:00:00 2001 From: pangyang <475446853@qq.com> Date: Sat, 28 Mar 2026 15:24:45 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=B4=A8=E9=87=8F=E6=A3=80?= =?UTF-8?q?=E9=AA=8C=E4=BB=BB=E5=8A=A1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WorkPlanItemServiceImpl.java | 36 ++++++++++++------- 1 file changed, 23 insertions(+), 13 deletions(-) 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