问题修改

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<BaseVehicleMapper, Ba
      * @param configSid
      * @return
      */
-    public AppCurrentCarDetailConfigVo getAppCurrentCarDetailConfigVo(String modelSid, String configSid, String userSid,String useOrgSid) {
+    public AppCurrentCarDetailConfigVo getAppCurrentCarDetailConfigVo(String modelSid, String configSid, String userSid, String useOrgSid) {
         String useOrg = "";
-        if(StringUtils.isNotBlank(useOrgSid)){
+        if (StringUtils.isNotBlank(useOrgSid)) {
             useOrg = useOrgSid;
-        }else{
+        } else {
             useOrg = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
         }
         AppCurrentCarDetailConfigVo configDetailVo = baseMapper.getAppModelConfig(modelSid, configSid, useOrg);
@@ -1378,7 +1378,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         QueryWrapper<AppBaseVehicleNowModelVo> 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<BaseVehicleMapper, Ba
         ResultBean rb = ResultBean.fireFail();
         QueryWrapper<BaseVehicle> 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> baseExistingCarListVo = baseMapper.selExistingCar(qw);
         for (BaseExistingCarListVo existingCarListVo : baseExistingCarListVo) {