Merge remote-tracking branch 'origin/master'

2 years ago · 6b1f288da9
2 changed files with 2 additions and 0 deletions
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml
@ -545,6 +545,7 @@
          AND bs.carryVehicleState = '0'
          AND bs.carryInvoiceState = '0'
          AND bs.busState = '401'
+          AND bs.vinNo != ''
    </select>

    <select id="selectByContractNoToVin" resultType="java.lang.String">
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml
@ -213,6 +213,7 @@
            AND bs.carryVehicleState = '0'
            AND bs.carryInvoiceState = '0'
            AND bs.busState = '401'
+            AND bs.vinNo != ''
        </where>
    </select>
 </mapper>