From 80d04f6f870c091694bd5f3706d0071f3b75a52e Mon Sep 17 00:00:00 2001
From: "zhenghaiyang@ele-cloud.com" <zhenghaiyang@ele-cloud.com>
Date: Sun, 30 Apr 2023 09:17:53 +0800
Subject: [PATCH] =?UTF-8?q?feature=201.=E5=A2=9E=E5=8A=A0=E4=B8=8D?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E4=B8=BA=E7=A9=BA=E7=9A=84=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commodity/model/CommodityCodeEntity.java    |  2 ++
 .../mybatis/mapper/GroupCommodityCodeMapper.xml | 17 ++++++++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/model/CommodityCodeEntity.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/model/CommodityCodeEntity.java
index 6caf4ced..32388541 100644
--- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/model/CommodityCodeEntity.java
+++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/model/CommodityCodeEntity.java
@@ -1,6 +1,7 @@
 package com.dxhy.order.baseservice.module.commodity.model;
 
 import com.dxhy.order.baseservice.annotation.FieldName;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -15,6 +16,7 @@ import java.util.Date;
  */
 @Setter
 @Getter
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class CommodityCodeEntity implements Serializable {
 
     /**
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 dc44f2be..96af0306 100644
--- a/order-management-consumer/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml
+++ b/order-management-consumer/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml
@@ -103,7 +103,22 @@
     <!-- 查询集团物料库 -->
     <select id="queryGroupCommodityCodeList" resultMap="commodityCodeResultMap">
         <bind name="dataType" value="${dataType}"/>
-        <include refid="baseSelect"/>
+        SELECT cc.id,
+        cc.commodity_id,
+        cc.merchandise_name,
+        cc.tax_items,
+        cc.brief_code,
+        cc.tax_rate,
+        cc.specification_model,
+        cc.metering_unit,
+        cc.unit_price,
+        cc.encoding,
+        cc.tax_class_abbreviation,
+        cc.wlflbm,
+        cc.wlflmc
+        FROM commodity_code cc
+        LEFT JOIN group_commodity gc
+        ON gc.id = cc.group_id
         <where>
             cc.xhf_nsrsbh = '-1'
             <if test="wlflbm != null and wlflbm != ''">