From 239927b057f65a040594f7a4cb08c8881b303797 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 18 Aug 2023 14:52:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl-230812' into cjl-230812
---
screen-api/src/main/java/com/moral/api/controller/SupervisionController.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/SupervisionController.java b/screen-api/src/main/java/com/moral/api/controller/SupervisionController.java
index 5b4e590..b266fa9 100644
--- a/screen-api/src/main/java/com/moral/api/controller/SupervisionController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/SupervisionController.java
@@ -36,7 +36,10 @@
private SupervisionService supervisionService;
@PostMapping("add")
- public ResultMessage add(MultipartFile[] files, Supervision supervision) {
+ public ResultMessage add(HttpServletRequest request) {
+ Map<String, Object> params = WebUtils.getParametersStartingWith(request, null);
+ List<MultipartFile> files = ((MultipartHttpServletRequest) request).getFiles("files");
+ Supervision supervision = JSONObject.parseObject(JSONObject.toJSONString(params), Supervision.class);
Map<String, Object> response = supervisionService.add(files, supervision);
if (!response.isEmpty()) {
return ResultMessage.fail(Integer.parseInt(response.get("code").toString()), response.get("msg").toString());
--
Gitblit v1.8.0