From 54cce185f383849322d5cc309d2ee5d155d15915 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 15 十一月 2023 18:57:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
mes-basic/src/main/java/com/chinaztt/mes/basic/controller/LocationController.java | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/mes-basic/src/main/java/com/chinaztt/mes/basic/controller/LocationController.java b/mes-basic/src/main/java/com/chinaztt/mes/basic/controller/LocationController.java
index 3324cce..55f1623 100644
--- a/mes-basic/src/main/java/com/chinaztt/mes/basic/controller/LocationController.java
+++ b/mes-basic/src/main/java/com/chinaztt/mes/basic/controller/LocationController.java
@@ -126,9 +126,7 @@
@PostMapping("/upload")
public R upload(@RequestParam("file") MultipartFile file) {
try {
- List<Warehouse> warehouseList = warehouseService.list();
- Map<String, Warehouse> map = warehouseList.stream().collect(Collectors.toMap(Warehouse::getWarehouseName, warehouse -> warehouse, (k1, k2) -> k1));
- EasyExcel.read(file.getInputStream(), LocationData.class, new LocationUploadListener(locationService, map)).sheet().doRead();
+ EasyExcel.read(file.getInputStream(), LocationData.class, new LocationUploadListener(locationService)).sheet().doRead();
} catch (IOException e) {
e.printStackTrace();
}
--
Gitblit v1.9.3