From bcd8b3b7e8ef8ca9079b53f316d1973308e3e457 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 14 Aug 2021 15:48:40 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_management_w

---
 src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java b/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
index ace18f0..1dc39f7 100644
--- a/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
+++ b/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
@@ -270,7 +270,7 @@
 	 * @return attachId
 	 */
 	private Long buildAttach(String fileName, Long fileSize, BladeFile bladeFile,String deptid,String type,Long noticeId) throws Exception {
-		BladeUser user = AuthUtil.getUser();
+		//BladeUser user = AuthUtil.getUser();
 		String fileExtension = FileUtil.getFileExtension(fileName);
 		Attach attach = new Attach();
 		attach.setDomain(bladeFile.getDomain());
@@ -279,7 +279,7 @@
 		attach.setOriginalName(bladeFile.getOriginalName());
 		attach.setAttachSize(fileSize);
 		attach.setExtension(fileExtension);
-		attach.setDeptid(user.getDeptId());
+		attach.setDeptid(deptid);
 		attach.setType(type);
 		if (null!=noticeId){
 			attach.setNoticeId(noticeId);

--
Gitblit v1.9.3