Merge branch 'master-background-manager' into dev

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

@@ -41,7 +41,8 @@
         SELECT r.* FROM (
         select DISTINCT v.`id`,
         v.`code`,
-        v.`status`,
+        (CASE WHEN #{status} != null THEN #{status}
+        ELSE 0 END) status ,
         v.number_plate,
         v.brand,
         v.park_branch_company_id,
@@ -113,7 +114,7 @@
             and v.insurance_company = #{insuranceCompany}
         </if>
         <if test="belongToName !=null and belongToName != ''">
-            and v.belong_to_name = like concat('%',#{belongToName},'%')
+            and v.belong_to_name  like concat('%',#{belongToName},'%')
         </if>
         <if test="vin !=null and vin != ''">
             and v.vin = #{vin}
@@ -178,7 +179,8 @@
         SELECT r.* FROM (
         select DISTINCT v.`id`,
         v.`code`,
-        v.`status`,
+        (CASE WHEN #{status} != null THEN #{status}
+        ELSE 0 END) status ,
         v.number_plate,
         v.brand,
         -- IFNULL(v.park_branch_company_id,v.expect_destination_branch_company_id) AS subordinate_branch,
@@ -275,7 +277,7 @@
             and v.insurance_company = #{insuranceCompany}
         </if>
         <if test="belongToName !=null and belongToName != ''">
-            and v.belong_to_name = like concat('%',#{belongToName},'%')
+            and v.belong_to_name like concat('%',#{belongToName},'%')
         </if>
         <if test="vin !=null and vin != ''">
             and v.vin = #{vin}