From b1412a03ad6f68ab592f4599a318421966c556c2 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期日, 19 五月 2024 14:12:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderLogisticsController.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderLogisticsController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderLogisticsController.java
index 78a056d..f8a9c87 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderLogisticsController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderLogisticsController.java
@@ -105,9 +105,11 @@
TOrderLogistics tOrderLogistics = tOrderLogisticsService.selectById(tOrderLogisticsId);
//修改之前司机状态 -- 空闲
- TDriver driver = itDriverService.selectById(tOrderLogistics.getDriverId());
- driver.setState(2);
- itDriverService.updateById(driver);
+ if(null != tOrderLogistics.getDriverId()){
+ TDriver driver = itDriverService.selectById(tOrderLogistics.getDriverId());
+ driver.setState(2);
+ itDriverService.updateById(driver);
+ }
tOrderLogistics.setState(10);
tOrderLogisticsService.updateById(tOrderLogistics);
--
Gitblit v1.7.1