From a42e0989485009e7196a8e8a7d25473b3d827cff Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 02 九月 2024 17:36:25 +0800
Subject: [PATCH] 插队操作+用户列表
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java | 8 +++-----
1 files changed, 3 insertions(+), 5 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..0f2c8b5 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,10 +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.getSampleType(),split1[2])).collect(Collectors.toList());
}
}
list = list.stream().filter(a -> {
@@ -272,7 +271,7 @@
int retryCount = 0;
while (!success && retryCount < 100) {
try {
- standardProductListService2.saveBatch(list.stream().map(a -> {
+ standardProductListService2.saveOrUpdateBatch(list.stream().map(a -> {
a.setFactory(trees[0]);
a.setLaboratory(trees[1]);
a.setSampleType(trees[2]);
@@ -281,7 +280,6 @@
a.setStandardMethodListId(id);
return a;
}).collect(Collectors.toList()));
- ;
success = true;
} catch (Exception e) {
retryCount++;
--
Gitblit v1.9.3