From c8c1d3356001ea7000ca3e5395e3f9edf84d6101 Mon Sep 17 00:00:00 2001
From: gaorl <gaoronglin@ele-cloud.com>
Date: Sat, 29 Apr 2023 21:25:47 +0800
Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9A=E7=89=A9=E6=96=99=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AFinvoice=5Fname=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mybatis/mapper/CommodityMapper.xml       | 2 +-
 .../main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 9e66802d..bb9b19cb 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
@@ -931,7 +931,7 @@
                 #{tswl,jdbcType=VARCHAR},
             </if>
             <if test="invoiceName != null">
-                #{invoice_name,jdbcType=VARCHAR},
+                #{invoiceName,jdbcType=VARCHAR},
             </if>
         </trim>
     </insert>
diff --git a/order-management-consumer/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml b/order-management-consumer/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml
index 81c7f8ff..dc44f2be 100644
--- a/order-management-consumer/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml
+++ b/order-management-consumer/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml
@@ -105,6 +105,7 @@
         <bind name="dataType" value="${dataType}"/>
         <include refid="baseSelect"/>
         <where>
+            cc.xhf_nsrsbh = '-1'
             <if test="wlflbm != null and wlflbm != ''">
                 AND cc.wlflbm LIKE CONCAT('%',#{wlflbm},'%')
             </if>
@@ -117,7 +118,6 @@
             <if test="xmmc != null and xmmc != ''">
                 AND cc.merchandise_name LIKE CONCAT('%',#{xmmc},'%')
             </if>
-            AND cc.xhf_nsrsbh = '-1'
         </where>
 
         ORDER BY cc.create_time DESC