diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java index b0c3e948..3799f7a2 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java @@ -159,21 +159,22 @@ public class InspectionTaskController extends BladeController { .eq(RemindMsg::getRemindMsgType, 1L) .orderByDesc(RemindMsg::getId); msgplateList = remindMsgService.list(qw); - int count = 0; - if(null != msgplateList && msgplateList.size() > 0){ - for(RemindMsg msg : msgplateList){ - if(null != msg.getQualityLevel() - && !"".equals(msg.getQualityLevel())){ - if(msg.getQualityLevel().equals(prodIdent)){ - ++count; - msgplateAllList.add(msg); - } - } - } - if(count == 0){ - msgplateAllList = msgplateList; - } - } + msgplateAllList = msgplateList; +// int count = 0; +// if(null != msgplateList && msgplateList.size() > 0){ +// for(RemindMsg msg : msgplateList){ +// if(null != msg.getQualityLevel() +// && !"".equals(msg.getQualityLevel())){ +// if(msg.getQualityLevel().equals(prodIdent)){ +// ++count; +// msgplateAllList.add(msg); +// } +// } +// } +// if(count == 0){ +// msgplateAllList = msgplateList; +// } +// } }else{//如果零件里镀种代号为空 LambdaQueryWrapper qw = Wrappers.lambdaQuery(Plating.class) .eq(Plating::getPlating, detailDetail.getPlatingInfo())