添加押运员、编辑押运员

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

@@ -144,32 +144,31 @@ public class TruckEscortServiceImpl extends ServiceImpl<TruckEscortMapper, Truck
 
     @Override
     public boolean edit(TruckEscort param) {
-        if (param.getMobile() != null || param.getEscortName() != null) {
-            User user = new User();
-            user.setCreater(param.getUpdater());
-            user.setUserId(param.getEscortId());
-            if (param.getMobile() != null) {
-                user.setMobile(param.getMobile());
-            }
-            if (param.getEscortName() != null) {
-                user.setUserName(param.getEscortName());
-            }
-            commonService.updateUser(user);
-
-            //删除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);
+        log.info("修改押运员，edit，参数:{}", JSON.toJSONString(param));
+        User user = new User();
+        user.setCreater(param.getUpdater());
+        user.setUserId(param.getEscortId());
+        if (param.getMobile() != null) {
+            user.setMobile(param.getMobile());
+        }
+        if (param.getEscortName() != null) {
+            user.setUserName(param.getEscortName());
         }
+        commonService.updateUser(user);
+
+        //删除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);
         return updateById(param);
     }