From 49aea08b5dd1de27c6cde862b5e9d5bfb2be1afa Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Wed, 2 Apr 2025 15:09:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/bonus/file/utils/MinioUtil.java  | 10 +++++++---
 .../src/main/resources/mapper/system/SysRoleMapper.xml |  4 ++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/bonus-modules/bonus-file/src/main/java/com/bonus/file/utils/MinioUtil.java b/bonus-modules/bonus-file/src/main/java/com/bonus/file/utils/MinioUtil.java
index 7073a73..961c974 100644
--- a/bonus-modules/bonus-file/src/main/java/com/bonus/file/utils/MinioUtil.java
+++ b/bonus-modules/bonus-file/src/main/java/com/bonus/file/utils/MinioUtil.java
@@ -12,7 +12,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -39,6 +38,11 @@ public class MinioUtil {
 
     @Resource
     private MinioConfig minioConfig;
+
+    /**
+     * i皖送，minio上传文件域名路径
+     */
+    public String domain = "http://sgwpdm.ah.sgcc.com.cn/iws/ahjiju/";
     /**
      * 分片大小
      */
@@ -105,10 +109,10 @@ public class MinioUtil {
         } else {
             uploadLargeFile(folderPath, file);
         }
-
+        String url = domain + folderPath;
         return SysFile.builder()
                 .name(file.getOriginalFilename())
-                .url(folderPath).build();
+                .url(url).build();
     }
 
     /**
diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysRoleMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysRoleMapper.xml
index 1a8ccc1..5cb3833 100644
--- a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysRoleMapper.xml
+++ b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysRoleMapper.xml
@@ -92,7 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<include refid="selectRoleVo"/>
 		 where r.role_name=#{roleName} and r.del_flag = '0'
 			<if test="companyId != null and companyId != 0">
-				AND company_id = #{companyId}
+				AND r.company_id = #{companyId}
 			</if>
 		 limit 1
 	</select>
@@ -101,7 +101,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<include refid="selectRoleVo"/>
 		 where r.role_key=#{roleKey} and r.del_flag = '0'
 			<if test="companyId != null and companyId != 0">
-				AND company_id = #{companyId}
+				AND r.company_id = #{companyId}
 			</if>
 		 limit 1
 	</select>