From d9505757da1a789c4bb9f7c05e8bfd1f09b77ba1 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期一, 28 八月 2023 09:25:33 +0800
Subject: [PATCH] 修改报告预览数据接口

---
 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