From 59ae18f04a602bdfdc91299bbe2ff74a2ae1d215 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 22 八月 2023 13:56:43 +0800
Subject: [PATCH] 改动2.0

---
 standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/StandardServiceImpl.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/StandardServiceImpl.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/StandardServiceImpl.java
index 9c7ab92..479ea03 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/StandardServiceImpl.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/StandardServiceImpl.java
@@ -107,8 +107,12 @@
                 List<Product> productList = productModel.stream().map(stringObjectMap -> {
                     Product product = new Product();
                     product.setName(stringObjectMap.get("name").toString());
-                    product.setFather(stringObjectMap.get("father").toString());
-                    product.setUnit(stringObjectMap.get("unit").toString());
+                    if (ObjectUtils.isNotEmpty(stringObjectMap.get("father"))) {
+                        product.setFather(stringObjectMap.get("father").toString());
+                    }
+                    if (ObjectUtils.isNotEmpty(stringObjectMap.get("unit"))) {
+                        product.setUnit(stringObjectMap.get("unit").toString());
+                    }
                     product.setSpecifications_id(specifications.getId());
                     return product;
                 }).collect(Collectors.toList());

--
Gitblit v1.9.3