Merge remote-tracking branch 'origin/master'

2 years ago · 82b9db1e04
1 changed files with 5 additions and 4 deletions
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml
@ -105,9 +105,10 @@
    </select>

    <select id="selectCountBySidVin" resultType="int">
-        select count(*)
-        from base_vehicle_out
-        where vinSid = #{vinSid}
+        SELECT COUNT(*)
+        FROM base_vehicle_out
+        WHERE vinSid = #{vinSid}
+          AND isDelete = 0
    </select>

    <select id="selectNum" resultType="java.lang.String">
@ -178,7 +179,7 @@
               bvoa.`staffName`,
               bvoa.saleDate,
               bvo.`price`,
-               bvoa.`contractNo` as concatNo,
+               bvoa.`contractNo`    as concatNo,
               bvo.`realityBuyCarPhone`,
               bvo.`realityBuyCarName`,
               bvoa.`customerName`,