From 501cc3b2bc315a692aaaa77fe97680706a225543 Mon Sep 17 00:00:00 2001
From: 77 <77@77.com>
Date: Tue, 21 May 2024 09:49:14 +0800
Subject: [PATCH] init

---
 .../java/com/ruoyi/system/controller/SysUserController.java     | 2 +-
 .../java/com/ruoyi/system/service/impl/SysOssServiceImpl.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
index 11a7f8b..4471b2c 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
@@ -147,7 +147,7 @@ public class SysUserController extends BaseController {
         if(vo == null){
             throw new ServiceException("未找到对应的平台");
         }
-        user.setUserName(vo.getPrefix()+"-"+user.getUserName());
+        user.setUserName(vo.getPrefix()+"_"+user.getUserName());
         user.setPrefix(vo.getPrefix());
         deptService.checkDeptDataScope(user.getDeptId());
         AtomicBoolean checkUserName = new AtomicBoolean(false);
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java
index d1daa63..942a480 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java
@@ -147,7 +147,7 @@ public class SysOssServiceImpl implements ISysOssService, OssService {
         OssClient storage = OssFactory.instance();
         UploadResult uploadResult;
         try {
-            uploadResult = storage.uploadFile(file.getBytes(), tenant.getPrefix(), suffix, file.getContentType());
+            uploadResult = storage.uploadFile(file.getBytes(), tenant.getTenantId(), suffix, file.getContentType());
         } catch (IOException e) {
             throw new ServiceException(e.getMessage());
         }