From 1d394446abb8465e63fd1fd9a768796e149edbd6 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Wed, 06 Oct 2021 19:52:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/java/com/matrix/system/common/actions/FileUploadAction.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/common/actions/FileUploadAction.java b/zq-erp/src/main/java/com/matrix/system/common/actions/FileUploadAction.java
index 2613e92..5dc9eda 100644
--- a/zq-erp/src/main/java/com/matrix/system/common/actions/FileUploadAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/common/actions/FileUploadAction.java
@@ -1,8 +1,12 @@
package com.matrix.system.common.actions;
+import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.tools.FileType;
+import com.matrix.core.tools.WebUtil;
import com.matrix.core.web.BaseAction;
+import com.matrix.system.common.bean.SysCompany;
import com.matrix.system.common.bean.SysUsers;
+import com.matrix.system.common.interceptor.HostInterceptor;
import com.matrix.system.common.tools.UploadUtil;
import org.apache.commons.fileupload.FileUploadException;
import org.springframework.stereotype.Controller;
@@ -41,7 +45,9 @@
public String doImageUpload(HttpServletResponse response, MultipartHttpServletRequest request)
throws IOException, FileUploadException, NoSuchAlgorithmException {
SysUsers user = getSessionUser();
- Map<String, String> fileMap = UploadUtil.doUpload(request, EXT_LIST, folderType, user.getSuId());
+
+ SysCompany company = WebUtil.getSessionAttribute(HostInterceptor.ATTR_COMPANY);
+ Map<String, String> fileMap = UploadUtil.doUpload(request, EXT_LIST, folderType, company.getComId());
String callBack = request.getParameter("callBack");
String inputId = request.getParameter("inputId");
request.setAttribute("callBack", callBack);
--
Gitblit v1.9.1