Ver código fonte

简称删除

chengang 4 anos atrás
pai
commit
a026ce4eb1

+ 2 - 3
src/main/java/com/aoyang/tms/controller/ShipperController.java

@@ -74,15 +74,14 @@ public class ShipperController {
         return new Result<>(shipperService.updateById(param));
     }
 
-    @ApiOperation(value = "添加托运方",notes="必传参数:orgId,orgName,orgShortName,shipperName")
+    @ApiOperation(value = "添加托运方",notes="必传参数:orgId,orgName,shipperName")
     @PostMapping("/add")
     public Result add(@RequestHeader(value = "userId") Long userId,
                       @RequestHeader(value = "userName") String userName,
                       @RequestBody Shipper param) {
 
         log.info("添加托运方,调用/tms/shipper/add,参数:{}", JSON.toJSONString(param));
-        if (param == null || param.getOrgId() == null || param.getOrgName() == null
-                 || param.getShipperName() == null) {
+        if (param == null || param.getOrgId() == null || param.getOrgName() == null || param.getShipperName() == null) {
             return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
         String utf8Name = userName;

+ 1 - 1
src/main/java/com/aoyang/tms/service/impl/WorkOrderServiceImpl.java

@@ -132,7 +132,7 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
                     queryWrapper.eq("user_id", vo.getOrderId());
                     WorkOrderReadinfo read = workOrderReadinfoService.getOne(queryWrapper);
                     ReadInfo readInfo = new ReadInfo();
-                    readInfo.setDriverId(truckEscort.getUserId());
+                    readInfo.setDriverId(truckEscort.getEscortId());
                     readInfo.setDriverName(truckEscort.getEscortName());
                     readInfo.setDriverType(1);
                     if (read == null) {