Merge remote-tracking branch 'origin/dev' into pre-production

8 months ago · 3b0f133b15
1 changed files with 3 additions and 0 deletions
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml
@ -513,6 +513,9 @@
                #{item}
            </foreach>
          </if>
+        <if test="param.waybillNo != null and param.waybillNo != ''">
+            and Locate(#{param.waybillNo},lww.waybill_no)
+        </if>
    </select>