From d91c78e445e49cda5430bd33ef281f60f56a0a2d Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期日, 05 二月 2023 20:09:10 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/data/upload/UploadController.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/data/upload/UploadController.java b/src/main/java/com/lf/server/controller/data/upload/UploadController.java
index 7cf4573..3850d3c 100644
--- a/src/main/java/com/lf/server/controller/data/upload/UploadController.java
+++ b/src/main/java/com/lf/server/controller/data/upload/UploadController.java
@@ -3,6 +3,7 @@
import com.lf.server.annotation.SysLog;
import com.lf.server.entity.all.ResponseMsg;
import com.lf.server.entity.all.StaticData;
+import com.lf.server.entity.ctrl.KeyValueEntity;
import com.lf.server.entity.data.DirEntity;
import com.lf.server.entity.data.MetaEntity;
import com.lf.server.entity.data.MetaFileEntity;
@@ -21,7 +22,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
-import java.util.Map;
/**
* 鏁版嵁鍏ュ簱
@@ -88,6 +88,10 @@
@PostMapping(value = "/uploadXlsAnnex")
public ResponseMsg<Object> uploadXlsAnnex(String path, Integer[] ids, HttpServletRequest req, HttpServletResponse res) {
try {
+ UserEntity ue = tokenService.getCurrentUser(req);
+ if (ue == null) {
+ return fail("鐢ㄦ埛鏈櫥褰�", null);
+ }
if (null == ids || ids.length == 0) {
return fail("鎵句笉鍒板厓鏁版嵁鐨処D闆嗗悎");
}
@@ -102,12 +106,12 @@
return fail("娌℃湁鎵惧埌涓婁紶鏂囦欢", null);
}
- Map<String, Integer> map = uploadAttachService.uploadXlsAnnex(ms, list, path);
- if (null == map || map.size() == 0) {
+ List<KeyValueEntity> rs = uploadAttachService.uploadXlsAnnex(ue, ms, list, path);
+ if (null == rs || rs.size() == 0) {
return fail("娌℃湁瑕佹洿鏂扮殑鍏冩暟鎹�");
}
- return success(map);
+ return success(rs);
} catch (Exception ex) {
return fail(ex.getMessage(), null);
}
--
Gitblit v1.9.3