luobang 2 年之前
父節點
當前提交
6bc959e64b
共有 1 個文件被更改,包括 11 次插入1 次删除
  1. 11 1
      src/main/resources/com/steerinfo/dil/mapper/StatisticalReportMapper.xml

+ 11 - 1
src/main/resources/com/steerinfo/dil/mapper/StatisticalReportMapper.xml

@@ -2044,7 +2044,12 @@
                     </if>
                     <if test="carrierList != null ">
                         and <foreach collection="carrierList" item="item" open="(" separator="or" close=")">
-                        R_CARRIER.CARRIER_ABBREVIATION like '%${item}%'
+                          <if test="item == null">
+                              R_CARRIER.CARRIER_ABBREVIATION is null
+                          </if>
+                        <if test="item != null">
+                            R_CARRIER.CARRIER_ABBREVIATION like '%${item}%'
+                        </if>
                     </foreach>
                     </if>
                     <if test="materialNameList != null">
@@ -2052,6 +2057,11 @@
                         RM.MATERIAL_NAME like '%${item}%'
                     </foreach>
                     </if>
+                    <if test="saleAreaList != null">
+                        and <foreach collection="saleAreaList" item="item" open="(" separator="or" close=")">
+                        RSA.AREA_NAME like '%${item}%'
+                    </foreach>
+                    </if>
                     order by ASO.SALE_ORDER_ID DESC, OO.ORDER_ID  DESC
                      )
     </select>