From b41ae4350e2588265e1dc5ca47dda0e897de4041 Mon Sep 17 00:00:00 2001
From: gaorl <gaoronglin@ele-cloud.com>
Date: Mon, 3 Jul 2023 16:54:25 +0800
Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9A=E7=89=A9=E6=96=99=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E6=97=A0=E7=A8=8E=E7=8E=87=E4=B8=8D=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/commodity/controller/CommodityController.java       | 3 +++
 .../src/main/resources/mybatis/mapper/CommodityMapper.xml      | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

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 6ba96bf9..7ad73f52 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
@@ -177,6 +177,9 @@ public class CommodityController {
         if(StringUtils.isBlank(commodityCodeEntity.getXmdj())){
             commodityCodeEntity.setXmdj("");
         }
+        if(StringUtils.isBlank(commodityCodeEntity.getSl())){
+            commodityCodeEntity.setSl("");
+        }
 
         /**
          * 添加校验
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 6dc936ff..e78e2068 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
@@ -270,7 +270,7 @@
             <if test="commodityCode.spjm != null and commodityCode.spjm != ''">
                 brief_code = #{commodityCode.spjm,jdbcType=VARCHAR},
             </if>
-            <if test="commodityCode.sl != null and commodityCode.sl != ''">
+            <if test="commodityCode.sl != null">
                 tax_rate = #{commodityCode.sl,jdbcType=VARCHAR},
             </if>
             <if test="commodityCode.ggxh != null">