于继渤 пре 2 година
родитељ
комит
0b3db8d1cb

+ 3 - 0
src/main/java/com/dk/mdm/mapper/common/CommonMapper.xml

@@ -454,6 +454,9 @@
         <if test="skuName != null">
             AND tmgs.sku_name LIKE concat('%',my_ex.likequery(#{skuName}),'%')
         </if>
+        <if test="categoryId != null">
+            AND tmgs.category_id = #{categoryId}::uuid
+        </if>
     </select>
 
     <!-- 获取商品个数 -->

+ 5 - 5
src/main/java/com/dk/mdm/mapper/ivt/OutboundMapper.xml

@@ -79,18 +79,18 @@
         <result column="payable_id" property="payableId" typeHandler="UuidTypeHandler"/>
         <result column="flg_valid" property="flgValid"/>
         <result column="cp_id" property="cpId"/>
-        <result column="org_name" property="orgName"/>
+<!--        <result column="org_name" property="orgName"/>-->
 <!--        <result column="staff_name" property="staffName"/>-->
-        <result column="cus_code" property="cusCode"/>
-        <result column="cus_name" property="cusName"/>
-        <result column="cus_phone" property="cusPhone"/>
+        <result column="cusCode" property="cusCode"/>
+        <result column="cusName" property="cusName"/>
+        <result column="cusPhone" property="cusPhone"/>
         <result column="contact_phone" property="contactPhone"/>
         <result column="contact_name" property="contactName"/>
         <result column="address_area" property="addressArea" typeHandler="JsonTypeHandler"/>
         <result column="address_name" property="addressName"/>
         <result column="address_no" property="addressNo"/>
         <result column="address_gcj02" property="addressGcj02" typeHandler="JsonTypeHandler"/>
-        <result column="address_full" property="addressFull"/>
+        <result column="addressFull" property="addressFull"/>
         <result column="channel_name" property="channelName"/>
         <result column="cus_from_name" property="cusFromName"/>
         <result column="out_reason" property="outReason" typeHandler="UuidTypeHandler"/>