|
@@ -375,8 +375,8 @@ public class KwfDriverService {
|
|
|
public void saveTruckAndAssociate(DriverAssociatedTruckSaveRequest request) {
|
|
public void saveTruckAndAssociate(DriverAssociatedTruckSaveRequest request) {
|
|
|
log.info("开始新增车辆档案并关联司机,request={}", JSON.toJSONString(request));
|
|
log.info("开始新增车辆档案并关联司机,request={}", JSON.toJSONString(request));
|
|
|
|
|
|
|
|
- Long entId = LoginUserHolder.getEntId();
|
|
|
|
|
- if (entId == null) {
|
|
|
|
|
|
|
+ String entId = request.getEntId();
|
|
|
|
|
+ if (org.apache.commons.lang3.StringUtils.isBlank(entId)) {
|
|
|
log.error("新增车辆档案失败:企业id不能为空");
|
|
log.error("新增车辆档案失败:企业id不能为空");
|
|
|
throw new BusinessPlatfromException(ErrorCodeEnum.PARAM_ERROR, "企业id不能为空");
|
|
throw new BusinessPlatfromException(ErrorCodeEnum.PARAM_ERROR, "企业id不能为空");
|
|
|
}
|
|
}
|
|
@@ -420,7 +420,7 @@ public class KwfDriverService {
|
|
|
|
|
|
|
|
// 构建关联请求并执行关联
|
|
// 构建关联请求并执行关联
|
|
|
AssociatedTrackAddRequest associatedTrackAddRequest = new AssociatedTrackAddRequest();
|
|
AssociatedTrackAddRequest associatedTrackAddRequest = new AssociatedTrackAddRequest();
|
|
|
- associatedTrackAddRequest.setEntId(entId);
|
|
|
|
|
|
|
+ associatedTrackAddRequest.setEntId(Long.valueOf(entId));
|
|
|
associatedTrackAddRequest.setDriverId(request.getDriverId());
|
|
associatedTrackAddRequest.setDriverId(request.getDriverId());
|
|
|
associatedTrackAddRequest.setTruckNo(truck.getTruckNo());
|
|
associatedTrackAddRequest.setTruckNo(truck.getTruckNo());
|
|
|
associatedTrackAddRequest.setTruckAxleId(request.getTruckAxleId());
|
|
associatedTrackAddRequest.setTruckAxleId(request.getTruckAxleId());
|