feature 1.增加不返回为空的数据

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 {
 
     /**

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 != ''">