diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java index f5dc81a31..2a4fde7ec 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java @@ -22,6 +22,7 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -191,13 +192,11 @@ public class StockInOrderApi extends BaseController { @PostMapping("/queryNoticePrint") public AjaxResult queryNoticePrint(@RequestBody StockInOrderDTO stockInOrderDTO) { StockInOrderDO stockInOrderDO = stockInOrderAssembler.toDO(stockInOrderDTO); - List headerList = stockInOrderApplicationService.queryNoticePrint(stockInOrderDO); + List headerList = stockInOrderApplicationService.queryNoticePrint(stockInOrderDO); List detailList = stockInOrderApplicationService.queryNoticePrintDetail(stockInOrderDO); Map result = new HashMap<>(); - if (!headerList.isEmpty()) { - result.put("header", headerList.get(0)); - } - result.put("detailList", detailList); + result.put("headerList", headerList == null ? Collections.emptyList() : headerList); + result.put("detailList", detailList == null ? Collections.emptyList() : detailList); return AjaxResult.success(result); }