From 0e6b0be87dc165a234b12ddb4b868e5a7473da6b Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Sat, 24 Jun 2023 17:52:39 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E4=BA=A7=E5=93=81?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=BC=96=E8=BE=91bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../thrsys/ThrProductsController.java         | 61 ++++++++++---------
 1 file changed, 32 insertions(+), 29 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java
index 1908ba6b6..db50e28f4 100644
--- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java
+++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java
@@ -201,35 +201,38 @@ public class ThrProductsController {
         String value = systemParamConfigService.selectValueByParamKey("enable_edit_third");
         if (StrUtil.isNotEmpty(value) && value.equals("1")) {
             UdiProductEntity udiProductEntity = udiProductService.findByNameCode(thrProductsEntity.getCode());
-            if (StrUtil.isNotEmpty(thrProductsEntity.getMeasname()))
-                udiProductEntity.setMeasname(thrProductsEntity.getMeasname());
-            if (StrUtil.isNotEmpty(thrProductsEntity.getSpec()))
-                udiProductEntity.setGgxh(thrProductsEntity.getSpec());
-            if (StrUtil.isNotEmpty(thrProductsEntity.getRegisterNo()))
-                udiProductEntity.setZczbhhzbapzbh(thrProductsEntity.getRegisterNo());
-            if (StrUtil.isNotEmpty(thrProductsEntity.getManufactory()))
-                udiProductEntity.setManufactory(thrProductsEntity.getManufactory());
-            if (StrUtil.isNotEmpty(thrProductsEntity.getCplb()))
-                udiProductEntity.setCplb(thrProductsEntity.getCplb());
-            if (StrUtil.isNotEmpty(thrProductsEntity.getFlbm()))
-                udiProductEntity.setFlbm(thrProductsEntity.getFlbm());
-            if (StrUtil.isNotEmpty(thrProductsEntity.getQxlb()))
-                udiProductEntity.setQxlb(thrProductsEntity.getQxlb());
-            if (StrUtil.isNotEmpty(thrProductsEntity.getYbbm()))
-                udiProductEntity.setYbbm(thrProductsEntity.getYbbm());
-            if (StrUtil.isNotEmpty(thrProductsEntity.getSptm()))
-                udiProductEntity.setSptm(thrProductsEntity.getSptm());
-            if (StrUtil.isNotEmpty(thrProductsEntity.getTyshxydm()))
-                udiProductEntity.setTyshxydm(thrProductsEntity.getTyshxydm());
-            if (StrUtil.isNotEmpty(thrProductsEntity.getZczbhhzbapzbh()))
-                udiProductEntity.setZczbhhzbapzbh(thrProductsEntity.getZczbhhzbapzbh());
-            if (StrUtil.isNotEmpty(thrProductsEntity.getYlqxzcrbarmc()))
-                udiProductEntity.setYlqxzcrbarmc(thrProductsEntity.getYlqxzcrbarmc());
-            if (StrUtil.isNotEmpty(thrProductsEntity.getCpms()))
-                udiProductEntity.setCpms(thrProductsEntity.getCpms());
-            if (StrUtil.isNotEmpty(thrProductsEntity.getStandard()))
-                udiProductEntity.setGgxh(thrProductsEntity.getStandard());
-            udiProductService.updateUdiInfo(udiProductEntity);
+            if (udiProductEntity != null) {
+                if (StrUtil.isNotEmpty(thrProductsEntity.getMeasname()))
+                    udiProductEntity.setMeasname(thrProductsEntity.getMeasname());
+                if (StrUtil.isNotEmpty(thrProductsEntity.getSpec()))
+                    udiProductEntity.setGgxh(thrProductsEntity.getSpec());
+                if (StrUtil.isNotEmpty(thrProductsEntity.getRegisterNo()))
+                    udiProductEntity.setZczbhhzbapzbh(thrProductsEntity.getRegisterNo());
+                if (StrUtil.isNotEmpty(thrProductsEntity.getManufactory()))
+                    udiProductEntity.setManufactory(thrProductsEntity.getManufactory());
+                if (StrUtil.isNotEmpty(thrProductsEntity.getCplb()))
+                    udiProductEntity.setCplb(thrProductsEntity.getCplb());
+                if (StrUtil.isNotEmpty(thrProductsEntity.getFlbm()))
+                    udiProductEntity.setFlbm(thrProductsEntity.getFlbm());
+                if (StrUtil.isNotEmpty(thrProductsEntity.getQxlb()))
+                    udiProductEntity.setQxlb(thrProductsEntity.getQxlb());
+                if (StrUtil.isNotEmpty(thrProductsEntity.getYbbm()))
+                    udiProductEntity.setYbbm(thrProductsEntity.getYbbm());
+                if (StrUtil.isNotEmpty(thrProductsEntity.getSptm()))
+                    udiProductEntity.setSptm(thrProductsEntity.getSptm());
+                if (StrUtil.isNotEmpty(thrProductsEntity.getTyshxydm()))
+                    udiProductEntity.setTyshxydm(thrProductsEntity.getTyshxydm());
+                if (StrUtil.isNotEmpty(thrProductsEntity.getZczbhhzbapzbh()))
+                    udiProductEntity.setZczbhhzbapzbh(thrProductsEntity.getZczbhhzbapzbh());
+                if (StrUtil.isNotEmpty(thrProductsEntity.getYlqxzcrbarmc()))
+                    udiProductEntity.setYlqxzcrbarmc(thrProductsEntity.getYlqxzcrbarmc());
+                if (StrUtil.isNotEmpty(thrProductsEntity.getCpms()))
+                    udiProductEntity.setCpms(thrProductsEntity.getCpms());
+                if (StrUtil.isNotEmpty(thrProductsEntity.getStandard()))
+                    udiProductEntity.setGgxh(thrProductsEntity.getStandard());
+                udiProductService.updateUdiInfo(udiProductEntity);
+            }
+
         }
         return ResultVOUtils.success("修改成功！");
     }