From 6cd59364f535c2f4cf40dd6a1f75240f02d0ebea Mon Sep 17 00:00:00 2001 From: zouyu <2723363702@qq.com> Date: 星期三, 14 八月 2024 16:38:03 +0800 Subject: [PATCH] 检验下单调整 --- inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java index e727387..05bb3a0 100644 --- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java +++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java @@ -78,9 +78,9 @@ //鍒ゆ柇闀垮害 if (split1.length > 4) { if (ObjectUtils.isNotEmpty(split1[3])) { - list = list.stream().filter(list1 -> list1.getSample().equals(split1[3])).collect(Collectors.toList()); + list = list.stream().filter(list1 -> Objects.nonNull(list1.getSample())&&Objects.equals(list1.getSample(),split1[3])).collect(Collectors.toList()); }else if (split1[3].equals("")) { - list = list.stream().filter(list1 -> list1.getSampleType().equals(split1[2])).collect(Collectors.toList()); + list = list.stream().filter(list1 -> Objects.nonNull(list1.getSampleType())&&Objects.equals(list1.getSample(),split1[2])).collect(Collectors.toList()); } } -- Gitblit v1.9.3