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();
         }
@@ -396,6 +395,10 @@ public class KwfDriverService {
      * @return
      */
     private void getDriverScore(String entId, String driverId, KwfDriverVo driver) {
+        if (true) {
+            return; //TODO 开关
+        }
+
         if (StringUtils.isEmpty(entId) || StringUtils.isEmpty(driverId)) {
             return;
         }

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/KwfDriverMapper.xml

@@ -163,7 +163,7 @@
         SELECT
         dr.id, dr.name, dr.phone, dr.idcard, dr.status, dr.auth_status authStatus, drc.expire_time idcardExpireTime,
         drc.address, drl.driver_no driverNo, drl.type licenseType, drl.expire_time licenseExpireTime,
-        drl.grant_unit licenseGrantUnit,drq.quali_no qualiNo, dr.ent_id entId, dr.create_by createBy,
+        drl.grant_unit licenseGrantUnit,drq.quali_no qualiNo, dre.ent_id entId, dr.create_by createBy,
         dr.create_time createTime,dr.update_time updateTime, dr.remark, fl.id fleetId, fl.name fleetName
         from kwf_driver dr
         left join kwf_driver_ent dre on dre.driver_id = dr.id

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,