diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index 224486e32a..c220d040de 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java @@ -837,11 +837,11 @@ public class BaseVehicleService extends MybatisBaseService qw = new QueryWrapper<>(); qw.eq("bv.lockedState", VehicleState.LockEnum.UN_LOCK.getCode()); if (StringUtils.isNotBlank(pagerQuery.getName())) { // 名称 - qw.and(wrapper -> wrapper.like("bvm.vehicleAlias", pagerQuery.getName()).or().like("bvm.vehicleTypeCode", pagerQuery.getName()).or().like("bvc.configCode",pagerQuery.getName())); + qw.and(wrapper -> wrapper.like("bvm.vehicleAlias", pagerQuery.getName()).or().like("bvm.vehicleTypeCode", pagerQuery.getName()).or().like("bvc.configCode", pagerQuery.getName())); } if (StringUtils.isNotBlank(pagerQuery.getEmissionStandard())) { // 排放标准 qw.eq("bvm.emissionStandardValue", pagerQuery.getEmissionStandard()); @@ -3662,6 +3662,7 @@ public class BaseVehicleService extends MybatisBaseService qw = new QueryWrapper<>(); qw.eq("bv.createOrgSid", createOrgSid); + qw.eq("bv.isDelete", 0); qw.and(wrapper -> wrapper.eq("bv.vehicleState", "0001").or().eq("bv.vehicleState", "0002")); List baseExistingCarListVo = baseMapper.selExistingCar(qw); for (BaseExistingCarListVo existingCarListVo : baseExistingCarListVo) {