Merge branch 'master-background-manager' into base-modify

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleMapper.xml

@@ -132,10 +132,10 @@
             and v.status = #{status}
         </if>
         <if test="status !=null and status == 6">
-            and  v3.id is not NULL and v2.book_type = 3
+            and  v3.id is not NULL and v2.book_type = 3 and v3.state = 0
         </if>
         <if test="status !=null and status == 7">
-            and  v3.id is not NULL and v2.book_type = 6
+            and  v3.id is not NULL and v2.book_type = 6 and v3.state = 0
         </if>
         <if test="numberPlate !=null and numberPlate != ''">
             and v.number_plate like concat('%',#{numberPlate},'%')