Merge remote-tracking branch 'origin/dev-chw' into dev-chw

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/VehicleApplyMapper.java

@@ -15,7 +15,7 @@ public interface VehicleApplyMapper extends Mapper<VehicleApply>, SelectByIdList
 
      List<VehicleApplyVo> selectList(VehicleApplyFindDTO vehicleApplyFindDTO);
 
-    @Select("SELECT * FROM  vehicle_apply WHERE vehicle_id=#{vehicleId} and form_type=2  ORDER BY upd_time DESC LIMIT 1")
+    @Select("SELECT * FROM  vehicle_apply WHERE vehicle_id=#{vehicleId} and form_type=2 and is_del = 0 ORDER BY upd_time DESC LIMIT 1")
     VehicleApply getOneByOrderUpdTime(@Param("vehicleId") String vehicleId);
 
     List<VehicleApplyVo> selectListByApp(VehicleApplyFindDTO vehicleApplyFindDTO);

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

@@ -10,6 +10,7 @@
         FROM vehicle_apply a
         LEFT JOIN branch_company i on a.subordinate_branch=i.id
         <where>
+              a.is_del = 0
             <if test="name != null and  name != ''">
                 AND ( a.`name` like concat('%',#{name},'%') or i.`name` like concat('%',#{name},'%') )
             </if>