修改空值

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

@@ -50,7 +50,7 @@ public class TruckEscortController {
     private CommonService commonService;
 
 
-    @ApiOperation(value = "获取车辆押运员分页列表", notes = "必传参数:orgId")
+    @ApiOperation(value = "获取车辆押运员分页列表", notes = "必传参数:orgId选填参数:keyWord(查escortName,mobile)")
     @PostMapping("/page_list")
     public Result list(@RequestBody PageParam<TruckEscortListParam> pageParam) {
         log.info("获取车辆押运员分页列表,调用/tms/truck_escort/page_list,参数:{}", JSON.toJSONString(pageParam));
@@ -127,7 +127,7 @@ public class TruckEscortController {
     @ApiOperation(value = "获取单个车辆押运员详情", notes = "必传参数：userId")
     @PostMapping("/get_one")
     public Result getOne(@RequestBody TruckEscort param) {
-        log.info("删除车辆押运员,调用/tms/truck_escort/delete,参数:{}", JSON.toJSONString(param));
+        log.info("删除车辆押运员,调用/tms/truck_escort/get_one,参数:{}", JSON.toJSONString(param));
         if (param == null || param.getUserId() == null) {
             return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }

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

@@ -51,7 +51,11 @@ public class TruckDeptServiceImpl extends ServiceImpl<TruckDeptMapper, TruckDept
             truckDeptListVO.setUpdater(truckDept.getUpdater());
             truckDeptListVO.setUpdateDate(truckDept.getUpdateDate());
             truckDeptListVO.setUpdaterName(truckDept.getUpdaterName());
-            truckDeptListVO.setTruckNum(commonService.findOrgTruckNumber(truckDept.getOrgId(), truckDept.getId()));
+            truckDeptListVO.setTruckNum(0);
+            if (commonService.findOrgTruckNumber(truckDept.getOrgId(), truckDept.getId()) != null) {
+                truckDeptListVO.setTruckNum(commonService.findOrgTruckNumber(truckDept.getOrgId(), truckDept.getId()));
+            }
+
             truckDeptListVO.setOrgId(truckDept.getOrgId());
             listVo.add(truckDeptListVO);
         }