Selaa lähdekoodia

添加押运员、编辑押运员

guoyong 4 vuotta sitten
vanhempi
commit
53892efab2

+ 1 - 1
src/main/java/com/aoyang/tms/controller/TruckEscortController.java

@@ -132,7 +132,7 @@ public class TruckEscortController {
             TruckEscort truckEscort = truckEscortService.findTruckEscort(truckEscortParam);
             log.info("修改车辆押运员,调用/tms/truck_escort/update,truckEscortParam:{},结果truckEscort:{}", JSON.toJSONString(truckEscortParam), JSON.toJSONString(truckEscort));
 
-            if (!truckEscort.getEscortId().equals(param.getEscortId())) {
+            if (truckEscort != null && !truckEscort.getEscortId().equals(param.getEscortId())) {
                 return new Result<>(ErrCodeEnum.ONLY_ONE_ESCORT.getCode(), ErrCodeEnum.ONLY_ONE_ESCORT.getMessage());
 
             }