From 15e31c6e6550f9e8bf6fb1df5ca5ad4cc726b64f Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 26 八月 2023 13:30:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/SpecificationsServiceImpl.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/SpecificationsServiceImpl.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/SpecificationsServiceImpl.java
index d318960..d6a5bd6 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/SpecificationsServiceImpl.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/SpecificationsServiceImpl.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.yuanchu.limslaboratory.mapper.ProductModelMapper;
import com.yuanchu.limslaboratory.pojo.Product;
import com.yuanchu.limslaboratory.pojo.Specifications;
@@ -14,7 +15,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
-import org.springframework.util.ObjectUtils;
import javax.annotation.Resource;
import java.util.ArrayList;
@@ -87,8 +87,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