添加押运员、编辑押运员

src/main/java/com/aoyang/tms/controller/TruckEscortController.java

@@ -111,7 +111,7 @@ public class TruckEscortController {
                          @RequestHeader(value = "userName") String userName,
                          @RequestBody TruckEscort param) {
         log.info("修改车辆押运员,调用/tms/truck_escort/update,参数:{}", JSON.toJSONString(param));
-        if (param == null || param.getEscortId() == null || StringUtils.isBlank(param.getEscortName()) || param.getTruckId() == null) {
+        if (param == null || param.getEscortId() == null || StringUtils.isBlank(param.getEscortName())) {
             return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
         String utf8Name = userName;

src/main/java/com/aoyang/tms/service/impl/TruckEscortServiceImpl.java

@@ -158,17 +158,19 @@ public class TruckEscortServiceImpl extends ServiceImpl<TruckEscortMapper, Truck
 
         //删除truck_driver
         boolean deleteFlag = truckDriverService.delete(param.getEscortId());
-        log.info("新增押运员，删除truckDriver，参数:{},结果:{}", JSON.toJSONString(param.getEscortId()), deleteFlag);
-        TruckDriver truckDriver = new TruckDriver();
-        truckDriver.setOrgId(param.getOrgId());
-        truckDriver.setTruckId(param.getTruckId());
-        truckDriver.setCreateDate(LocalDateTime.now());
-        truckDriver.setCreater(param.getCreater());
-        truckDriver.setCreaterName(param.getCreaterName());
-        truckDriver.setDriverId(param.getEscortId());
-        truckDriver.setDriverName(user.getUserName());
-        boolean saveTruckDriver = truckDriverService.save(truckDriver);
-        log.info("新增押运员，新增truckDriver，参数:{},结果:{}", JSON.toJSONString(truckDriver), saveTruckDriver);
+        if (param.getTruckId() != null) {
+            log.info("新增押运员，删除truckDriver，参数:{},结果:{}", JSON.toJSONString(param.getEscortId()), deleteFlag);
+            TruckDriver truckDriver = new TruckDriver();
+            truckDriver.setOrgId(param.getOrgId());
+            truckDriver.setTruckId(param.getTruckId());
+            truckDriver.setCreateDate(LocalDateTime.now());
+            truckDriver.setCreater(param.getCreater());
+            truckDriver.setCreaterName(param.getCreaterName());
+            truckDriver.setDriverId(param.getEscortId());
+            truckDriver.setDriverName(user.getUserName());
+            boolean saveTruckDriver = truckDriverService.save(truckDriver);
+            log.info("新增押运员，新增truckDriver，参数:{},结果:{}", JSON.toJSONString(truckDriver), saveTruckDriver);
+        }
         return updateById(param);
     }