车辆管理，物理删除改为逻辑删除

2c2c2c
1 parent 5233fc8d
Showing 3 changed files with 5 additions and 3 deletions
trash-unit/src/main/java/com/trash/carInfo/controller/CarInfoController.java
trash-unit/src/main/java/com/trash/carInfo/domain/vo/CarInfoVo.java
trash-unit/src/main/resources/mapper/unit/CarInfoMapper.xml
@@ -41,8 +41,9 @@ public class CarInfoController extends BaseController
     public TableDataInfo list(CarInfoVo carInfo)
     {
         startPage();
-        carInfo.setIsDel("1");
+        carInfo.setIsDel(1);
         List<CarInfoVo> list = carInfoService.selectCarInfoList(carInfo);
+        TableDataInfo data = getDataTable(list);
         if(CollectionUtils.isNotEmpty(list)){
             list = list.stream().map(car->{
                 if(Objects.equals(car.getCarType(),"轻型货车")){
@@ -59,7 +60,7 @@ public class CarInfoController extends BaseController
             }).collect(Collectors.toList());
         }
-        return getDataTable(list);
+        return data;
     }
     /**
@@ -7,6 +7,7 @@ public class CarInfoVo extends CarInfo {
     private String driversName;
+
     public String getCompanyName() {
         return companyName;
     }
@@ -143,7 +143,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="drivers != null  and drivers != ''"> and drivers = #{drivers}</if>
             <if test="status != null "> and car.status = #{status}</if>
             <if test="creditStatus != null  and creditStatus != ''"> and car.credit_status = #{creditStatus}</if>
-                <if test="isDel != null  and isDel != ''"> and car.is_del = #{isDel}</if>
+                <if test="isDel != null"> and car.is_del = #{isDel}</if>
         </where>
     </select>