添加押运员

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

@@ -73,10 +73,10 @@ public class TruckEscortController {
     @ApiOperation(value = "添加车辆押运员", notes = "必传参数:orgId,escortName,mobile")
     @PostMapping("/add")
     public Result add(@RequestHeader(value = "userId") Long userId,
-                      @RequestHeader(value = "userName") String userName,
+                      @RequestHeader(value = "userName") String userName, @RequestHeader(value = "orgId") Long orgId,
                       @RequestBody TruckEscortAddParam param) {
         log.info("添加车辆押运员,调用/tms/truck_escort/add,参数:{}", JSON.toJSONString(param));
-        if (param == null || param.getOrgId() == null || param.getEscortName() == null || param.getMobile() == null) {
+        if (param == null || param.getTruckId() == null || param.getEscortName() == null || param.getMobile() == null) {
             return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
         String utf8Name = userName;
@@ -89,14 +89,13 @@ public class TruckEscortController {
         param.setCreaterName(utf8Name);
         param.setCreateDate(LocalDateTime.now());
 
-        if (param.getTruckId() != null) {
-            TruckEscortListParam truckEscortListParam = new TruckEscortListParam();
-            truckEscortListParam.setTruckId(param.getTruckId());
-            List<TruckEscort> list = truckEscortService.list(truckEscortListParam);
-            if (list != null && list.size() > 0) {
-                return new Result<>(ErrCodeEnum.ONLY_ONE_ESCORT.getCode(), ErrCodeEnum.ONLY_ONE_ESCORT.getMessage());
-
-            }
+        TruckEscortListParam truckEscortListParam = new TruckEscortListParam();
+        truckEscortListParam.setTruckId(param.getTruckId());
+        log.info("添加车辆押运员,调用/tms/truck_escort/add,truckEscortListParam参数:{}", JSON.toJSONString(truckEscortListParam));
+        List<TruckEscort> list = truckEscortService.list(truckEscortListParam);
+        log.info("添加车辆押运员,调用/tms/truck_escort/add,结果list:{}", JSON.toJSONString(list));
+        if (list != null && list.size() > 0) {
+            return new Result<>(ErrCodeEnum.ONLY_ONE_ESCORT.getCode(), ErrCodeEnum.ONLY_ONE_ESCORT.getMessage());
         }
 
         return new Result<>(truckEscortService.add(param));