From f4c181608411d60293c836621dc90b9120e3a451 Mon Sep 17 00:00:00 2001
From: JaneYork <janeyork1314@163.com>
Date: 星期五, 22 七月 2022 15:27:00 +0800
Subject: [PATCH] 主动设置文件公共读，适配天翼云OSS 主动设置文件公共读，适配天翼云OSS。 天翼云，即便bucket设置公共读，文件默认也是private，除非手动设置，详见天翼云：https://console.xstore.ctyun.cn/doc/store/sdk/java/objectOperation/putObject.html 已测试： 所有兼容S3协议的OSS，已测试：阿里云、腾讯云、百度、京东、天翼、自建Minio、七牛
---
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java
index e37116d..e2b3c01 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java
@@ -1,5 +1,7 @@
package com.ruoyi.system.mapper;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.annotation.DataColumn;
import com.ruoyi.common.annotation.DataPermission;
@@ -19,18 +21,18 @@
@DataPermission({
@DataColumn(key = "deptName", value = "d.dept_id")
})
- Page<SysRole> selectPageRoleList(@Param("page") Page<SysRole> page, @Param("role") SysRole role);
+ Page<SysRole> selectPageRoleList(@Param("page") Page<SysRole> page, @Param(Constants.WRAPPER) Wrapper<SysRole> queryWrapper);
/**
* 鏍规嵁鏉′欢鍒嗛〉鏌ヨ瑙掕壊鏁版嵁
*
- * @param role 瑙掕壊淇℃伅
+ * @param queryWrapper 鏌ヨ鏉′欢
* @return 瑙掕壊鏁版嵁闆嗗悎淇℃伅
*/
@DataPermission({
@DataColumn(key = "deptName", value = "d.dept_id")
})
- List<SysRole> selectRoleList(SysRole role);
+ List<SysRole> selectRoleList(@Param(Constants.WRAPPER) Wrapper<SysRole> queryWrapper);
/**
* 鏍规嵁鐢ㄦ埛ID鏌ヨ瑙掕壊
--
Gitblit v1.9.3