查询车辆优化

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/service/KwfDriverService.java

@@ -358,8 +358,7 @@ public class KwfDriverService {
         //查询车辆信息
         KwfTruck truck = truckRepository.getOne(Wrappers.<KwfTruck>lambdaQuery()
                 .eq(BaseModel::getDelFlag, 0)
-                .eq(KwfTruck::getId, truckReport.getTruckId())
-                .eq(KwfTruck::getEntId, entId));
+                .eq(KwfTruck::getId, truckReport.getTruckId()));
         if (truck == null) {
             return new KwfTruck();
         }

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/service/KwfTruckService.java

@@ -376,8 +376,7 @@ public class KwfTruckService {
         //查询司机信息
         KwfDriver driver = kwfDriverRepository.getOne(Wrappers.<KwfDriver>lambdaQuery()
                 .eq(BaseModel::getDelFlag, 0)
-                .eq(KwfDriver::getId, truckReport.getDriverId())
-                .eq(KwfDriver::getEntId, entId));
+                .eq(KwfDriver::getId, truckReport.getDriverId()));
         if (driver == null) {
             return new KwfDriver();
         }

sckw-modules/sckw-fleet/src/main/resources/mapper/KwfTruckMapper.xml

@@ -174,7 +174,7 @@
 
     <select id="findPage" resultType="com.sckw.fleet.model.vo.KwfTruckVo" parameterType="java.util.Map" >
         SELECT
-        tr.id, tr.ent_id entId, tr.truck_no truckNo, tr.type, tr.energy_type energyType, tr.use_type useType,
+        tr.id, tre.ent_id entId, tr.truck_no truckNo, tr.type, tr.energy_type energyType, tr.use_type useType,
         tr.spec, tr.actual_weight actualWeight, tr.gross_weight grossWeight, tr.tare_weight tareWeight,
         tr.color, tr.eev, tr.trailer_no trailerNo, tr.total_complete totalComplete, tr.total_take totalTake,
         tr.total_weight totalWeight, tr.business_status businessStatus, tr.remark, tr.status, tr.auth_status authStatus,