1.干线-bug修复

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/TripartiteTransferController.java

@@ -377,12 +377,6 @@ public class TripartiteTransferController {
 				log.warn(method+"配载id为空 loadId={}",loadId);
 				return R.fail(400,"配载id为空");
 			}
-
-			if(Objects.isNull(assistantId)){
-				log.warn(method+"副驾id为空 assistantId={}",assistantId);
-				return R.fail(400,"副驾id为空");
-			}
-
 			if(Objects.isNull(driverId)){
 				log.warn(method+"司机id为空 driverId={}",driverId);
 				return R.fail(400,"司机id为空");
@@ -397,18 +391,10 @@ public class TripartiteTransferController {
 				return R.fail(400,"司机电话为空");
 			}
 
-			if(Objects.isNull(carId)){
-				log.warn(method+"车辆id为空 carId={}",carId);
-				return R.fail(400,"车辆id为空");
-			}
 			if(StringUtil.isBlank(chargeType)){
 				log.warn(method+"分摊方式为空 chargeType={}",chargeType);
 				return R.fail(400,"分摊方式为空");
 			}
-			if(StringUtil.isBlank(carNumber)){
-				log.warn(method+"车牌号为空 carNumber={}",carNumber);
-				return R.fail(400,"车牌号为空");
-			}
 
 			if(StringUtil.isBlank(loadType)){
 				log.warn(method+"配载类型为空 loadType={}",loadType);

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java

@@ -1074,6 +1074,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 
 
 			Long carsLoadLineId = carsLoadLineDTO.getId();
+			if(!Objects.isNull(updateType)){
 				if(1 == updateType){
 					TrunklineCarsLoadLineEntity loadLineEntity = trunklineCarsLoadLineService.getById(carsLoadLineId);
 					loadLineEntity.setSort(sort);
@@ -1094,6 +1095,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 					trunklineCarsLoadLineService.save(carsLoadLineEntity);
 					carsLoadLineId = carsLoadLineEntity.getId();
 				}
+			}
 
 			List<TrunklineCarsOrderDTO> addList = carsLoadLineDTO.getAddList();
 			List<TrunklineCarsOrderDTO> removeList = carsLoadLineDTO.getRemoveList();