From 9ef0093b502af64e197cc19fd2bc2e694218e4d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=E5=98=89=E9=98=B3?= <fjy8018@qq.com>
Date: Wed, 25 Apr 2018 22:48:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=AE=A1=E7=90=86=E5=91=98?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                |  2 +-
 .../com/fjy/spring/controller/UpLoadController.java    | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3ace0a9..01ff629 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.fjy</groupId>
 	<artifactId>spring</artifactId>
-	<version>V2.8.1</version>
+	<version>V2.8.3</version>
 	<packaging>jar</packaging>
 
 	<name>spring</name>
diff --git a/src/main/java/com/fjy/spring/controller/UpLoadController.java b/src/main/java/com/fjy/spring/controller/UpLoadController.java
index 4a90ba7..c34e406 100644
--- a/src/main/java/com/fjy/spring/controller/UpLoadController.java
+++ b/src/main/java/com/fjy/spring/controller/UpLoadController.java
@@ -144,7 +144,7 @@ public class UpLoadController {
     public void moreUpload(HttpServletRequest request,
                            @RequestParam(value = "courseName", required = false) String courseName,
                            @RequestParam(value = "folder", required = false) String folder,
-                           @RequestParam(value = "workid") Integer workId,
+                           @RequestParam(value = "workid", required = false) Integer workId,
                            @RequestParam(value = "rename", required = true) boolean rename) {
 
         MultipartHttpServletRequest multipartHttpServletRequest = (MultipartHttpServletRequest) request;
@@ -173,7 +173,11 @@ public class UpLoadController {
         List<String> fileList = new ArrayList<String>();
 
         for (MultipartFile file : files.values()) {
-            Homework homework = homeworkService.findById(workId);
+            Homework homework = new Homework();
+            //管理员上传不需要传workId
+            if (workId != null) {
+                homework = homeworkService.findById(workId);
+            }
             String filePrefix = homework.getFilePrefix();
             String fileSuffix = homework.getFileSuffix();
             String filename = file.getOriginalFilename();
@@ -185,7 +189,7 @@ public class UpLoadController {
 
 
             //文件重命名
-            if (rename) {
+            if (rename && workId != null) {
                 pathname = uploadUrl + filePrefix + user.getColstudentno() + user.getColrealname() + fileSuffix + suffix;
                 tbFile.setColfilename(filePrefix + user.getColstudentno() + user.getColrealname() + fileSuffix + suffix);
             } else {