From 86c8b02bdfd88a97bf7b8a6c63eeb117bd78d7d5 Mon Sep 17 00:00:00 2001
From: gaorl <gaoronglin@ele-cloud.com>
Date: Tue, 13 Jun 2023 17:41:57 +0800
Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9A=E4=BF=AE=E6=94=B9=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E8=A7=84=E6=A0=BC=E5=9E=8B=E5=8F=B7=E3=80=81=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D=E3=80=81=E5=8D=95=E4=BB=B7=E3=80=81=E5=BC=80=E7=A5=A8?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E4=BF=AE=E6=94=B9=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commodity/controller/CommodityController.java   | 13 +++++++++++++
 .../resources/mybatis/mapper/CommodityMapper.xml    |  8 ++++----
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/controller/CommodityController.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/controller/CommodityController.java
index 046a1881..c929864d 100644
--- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/controller/CommodityController.java
+++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/controller/CommodityController.java
@@ -167,6 +167,19 @@ public class CommodityController {
         if(StringUtils.isBlank(commodityCodeEntity.getZxbm())||"000000000000000000".equals(commodityCodeEntity.getZxbm())){
             commodityCodeEntity.setZxbm(commodityCodeEntity.getId());
         }
+        if(StringUtils.isBlank(commodityCodeEntity.getGgxh())){
+            commodityCodeEntity.setGgxh("");
+        }
+        if(StringUtils.isBlank(commodityCodeEntity.getXmdw())){
+            commodityCodeEntity.setXmdw("");
+        }
+        if(StringUtils.isBlank(commodityCodeEntity.getXmdj())){
+            commodityCodeEntity.setXmdj("");
+        }
+        if(StringUtils.isBlank(commodityCodeEntity.getInvoiceName())){
+            commodityCodeEntity.setInvoiceName("");
+        }
+
         /**
          * 添加校验
          */
diff --git a/order-management-base-service/src/main/resources/mybatis/mapper/CommodityMapper.xml b/order-management-base-service/src/main/resources/mybatis/mapper/CommodityMapper.xml
index a38dacc6..318791fd 100644
--- a/order-management-base-service/src/main/resources/mybatis/mapper/CommodityMapper.xml
+++ b/order-management-base-service/src/main/resources/mybatis/mapper/CommodityMapper.xml
@@ -266,13 +266,13 @@
             <if test="commodityCode.sl != null and commodityCode.sl != ''">
                 tax_rate = #{commodityCode.sl,jdbcType=VARCHAR},
             </if>
-            <if test="commodityCode.ggxh != null and commodityCode.ggxh != ''">
+            <if test="commodityCode.ggxh != null">
                 specification_model = #{commodityCode.ggxh,jdbcType=VARCHAR},
             </if>
-            <if test="commodityCode.xmdw != null and commodityCode.xmdw != ''">
+            <if test="commodityCode.xmdw != null">
                 metering_unit = #{commodityCode.xmdw,jdbcType=VARCHAR},
             </if>
-            <if test="commodityCode.xmdj != null and commodityCode.xmdj != ''">
+            <if test="commodityCode.xmdj != null">
                 unit_price = #{commodityCode.xmdj,jdbcType=VARCHAR},
             </if>
             <if test="commodityCode.hsbz != null and commodityCode.hsbz != ''">
@@ -356,7 +356,7 @@
             <if test="commodityCode.tswl != null and commodityCode.tswl != ''">
                 tswl = #{commodityCode.tswl,jdbcType=VARCHAR},
             </if>
-            <if test="commodityCode.invoiceName != null and commodityCode.invoiceName != ''">
+            <if test="commodityCode.invoiceName != null">
                 invoice_name = #{commodityCode.invoiceName,jdbcType=VARCHAR},
             </if>