Browse Source

[update] 在途明细异常问题捕获

miajio 2 tuần trước cách đây
mục cha
commit
f06d73be47

+ 7 - 0
warehouse-admin-web/src/main/java/com/yr/warehouse/admin/web/driver/controller/DriverRouteDetailController.java

@@ -69,6 +69,10 @@ public class DriverRouteDetailController extends BaseController {
     @ResponseBody
     public PageResult<DriverRouteDetailResponse> pageToDriver(@Validated @RequestBody DriverRouteDetailPageToDriverRequest request, AdminUserInfo adminUserInfo) {
         DriverGoodsLossRecord driverGoodsLossRecord = driverGoodsLossRecordService.selectByAreaStaffIdAdStatDate(request.getAreaStaffId(), request.getStatDate());
+        if (null == driverGoodsLossRecord) {
+            PageResult<DriverRouteDetailResponse> result = PageResult.newPageResult(request.getPageNum(), request.getPageSize());
+            return result.success(0, new ArrayList<>());
+        }
 
         DriverRouteDetailPageRequest req = new DriverRouteDetailPageRequest();
         req.setGoodsLossRecordId(driverGoodsLossRecord.getId());
@@ -119,6 +123,9 @@ public class DriverRouteDetailController extends BaseController {
     @ResponseBody
     public Result<String> exportToDriver(@Validated @RequestBody DriverRouteDetailExportToDriverRequest request, AdminUserInfo adminUserInfo) {
         DriverGoodsLossRecord driverGoodsLossRecord = driverGoodsLossRecordService.selectByAreaStaffIdAdStatDate(request.getAreaStaffId(), request.getStatDate());
+        if (null == driverGoodsLossRecord) {
+            return Result.fail("没有可导出的数据");
+        }
         DriverRouteDetailExportRequest req = new DriverRouteDetailExportRequest();
         req.setGoodsLossRecordId(driverGoodsLossRecord.getId());
         req.setGoodsName(request.getGoodsName());