From 5365852e1ec63ab8682134751dbef7603b313ed3 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Sat, 27 May 2023 18:01:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=AC=AC=E4=B8=89=E6=96=B9?=
 =?UTF-8?q?=E4=BA=A7=E5=93=81=E8=A7=84=E6=A0=BC=E5=9E=8B=E5=8F=B7=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/thrsys/impl/ThrProductsServiceImpl.java   | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java
index 95b2a071f..21f80135c 100644
--- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java
@@ -198,6 +198,9 @@ public class ThrProductsServiceImpl extends ServiceImpl<ThrProductsDao, ThrProdu
                         if (isChange) {
                             BeanUtil.copyProperties(item, thrProductsEntity, new CopyOptions().setIgnoreNullValue(true));
                             thrProductsEntity.setUpdateTime(new Date());
+                            if (StrUtil.isEmpty(thrProductsEntity.getSpec())) {
+                                thrProductsEntity.setSpec(thrProductsEntity.getStandard());
+                            }
                             thrProductsDao.updateEntityById(thrProductsEntity);
                         }
                     }
@@ -245,6 +248,9 @@ public class ThrProductsServiceImpl extends ServiceImpl<ThrProductsDao, ThrProdu
                         if (isChange) {
                             BeanUtil.copyProperties(item, thrProductsEntity, new CopyOptions().setIgnoreNullValue(true));
                             thrProductsEntity.setUpdateTime(new Date());
+                            if (StrUtil.isEmpty(thrProductsEntity.getSpec())) {
+                                thrProductsEntity.setSpec(thrProductsEntity.getStandard());
+                            }
                             thrProductsDao.updateEntityById(thrProductsEntity);
                         }
                     }
@@ -276,7 +282,10 @@ public class ThrProductsServiceImpl extends ServiceImpl<ThrProductsDao, ThrProdu
         //将关键字段的值设置为新数据的值
         thrProductsEntity.setName(thrProductsResponse.getName());
         thrProductsEntity.setMeasname(thrProductsResponse.getMeasname());
-        thrProductsEntity.setSpec(thrProductsResponse.getSpec());
+
+        if (StrUtil.isEmpty(thrProductsResponse.getSpec())) {
+            thrProductsEntity.setSpec(thrProductsResponse.getStandard());
+        }
         thrProductsEntity.setRegisterNo(thrProductsResponse.getRegisterNo());
         thrProductsEntity.setManufactory(thrProductsResponse.getManufactory());
         thrProductsEntity.setCplb(thrProductsResponse.getCplb());