未售买断车辆

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@@ -21,7 +21,6 @@ import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositVehicleQuer
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
-import com.yxt.anrui.scm.api.scmvehiclegression.ScmVehicleGressionPageVo;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.DateUtils;
@@ -1195,7 +1194,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
             //库存状态：库存
             qw.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode());
             //调车状态：未调车
-            qw.eq("bv.witPinState","100");
+            qw.eq("bv.witPinState", "100");
         }
         return qw;
     }
@@ -1223,7 +1222,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         if (params != null) {
             if (StringUtils.isNotBlank(params.getUserSid())) {
                 String orgSid = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid()).getData();
-                qw.eq("bv.useOrgSid", orgSid);
+                qw.eq("bv.createOrgSid", orgSid);
 
             }
             //品牌
@@ -1277,6 +1276,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
             qw.eq("bv.settlementStatus", VehicleState.BuyoutEnum.UN_BUYOUT.getCode());
             //车辆状态：现车
             qw.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode());
+            qw.eq("bv.isDelete", 0);
         }
         return qw;
     }