Explorar el Código

feat:司机未绑定车辆bug

wangweiyu hace 4 años
padre
commit
f3cbf4d4c6
Se han modificado 1 ficheros con 12 adiciones y 12 borrados
  1. 12 12
      src/main/java/com/aoyang/tms/service/impl/CommonServiceImpl.java

+ 12 - 12
src/main/java/com/aoyang/tms/service/impl/CommonServiceImpl.java

@@ -96,18 +96,18 @@ public class CommonServiceImpl implements CommonService {
         truckParam.setTruckId(truckId);
         Truck truck = truckService.getById(truckParam);
         log.info("findTruckInfo findTruck 结果:{}", JSON.toJSONString(truck));
-        if (truck != null) {
-            workerInfo.setTruckStatus(truck.getTmsStatus());
-            workerInfo.setCarNumber(truck.getCarNumber());
-            workerInfo.setTrailerNumber(truck.getTrailerNumber());
-            workerInfo.setDeptId(truck.getDeptId());
-            workerInfo.setDeptName(truck.getDeptName());
-            workerInfo.setIsZhongche("空车");
-            boolean zhongFlag = checkTruckZhong(truckId);
-            if (zhongFlag) {
-                workerInfo.setIsZhongche("重车");
-            }
-
+        if (truck == null) {
+            return null;
+        }
+        workerInfo.setTruckStatus(truck.getTmsStatus());
+        workerInfo.setCarNumber(truck.getCarNumber());
+        workerInfo.setTrailerNumber(truck.getTrailerNumber());
+        workerInfo.setDeptId(truck.getDeptId());
+        workerInfo.setDeptName(truck.getDeptName());
+        workerInfo.setIsZhongche("空车");
+        boolean zhongFlag = checkTruckZhong(truckId);
+        if (zhongFlag) {
+            workerInfo.setIsZhongche("重车");
         }
         //司机信息
         log.info("findTruckInfo findTruckDrivers 参数:{}", JSON.toJSONString(truckId));