opensource/RuoYi-Vue-Plus
2
0
Fork 1
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-09-18 09:35:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Pre Merge pull request !709 from Liang-DongXing/dev

Browse Source
This commit is contained in:
Liang-DongXing 2025-06-27 07:08:01 +00:00 committed by Gitee
commit c0664d461b
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
7 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/annotation/DataColumn.java
View File

@ -21,14 +21,14 @@ public @interface DataColumn {
* *
* @return 占位符关键字数组 * @return 占位符关键字数组
*/ */
String[] key() default "deptName"; String[] key();
/** /**
* 数据权限模板的占位符替换值，默认为 "dept_id" * 数据权限模板的占位符替换值，默认为 "dept_id"
* *
* @return 占位符替换值数组 * @return 占位符替换值数组
*/ */
String[] value() default "dept_id"; String[] value();
/** /**
* 权限标识符 用于通过菜单权限标识符来获取数据权限 * 权限标识符 用于通过菜单权限标识符来获取数据权限

20
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TestDemoMapper.java
View File

@ -24,15 +24,15 @@ import java.util.List;
public interface TestDemoMapper extends BaseMapperPlus<TestDemo, TestDemoVo> { public interface TestDemoMapper extends BaseMapperPlus<TestDemo, TestDemoVo> {
@DataPermission({ @DataPermission({
@DataColumn(key = "deptName", value = "dept_id"), @DataColumn(key = "deptName", value = "create_dept"),
@DataColumn(key = "userName", value = "user_id") @DataColumn(key = "userName", value = "create_by")
}) })
Page<TestDemoVo> customPageList(@Param("page") Page<TestDemo> page, @Param("ew") Wrapper<TestDemo> wrapper); Page<TestDemoVo> customPageList(@Param("page") Page<TestDemo> page, @Param("ew") Wrapper<TestDemo> wrapper);
@Override @Override
@DataPermission({ @DataPermission({
@DataColumn(key = "deptName", value = "dept_id"), @DataColumn(key = "deptName", value = "create_dept"),
@DataColumn(key = "userName", value = "user_id") @DataColumn(key = "userName", value = "create_by")
}) })
default <P extends IPage<TestDemoVo>> P selectVoPage(IPage<TestDemo> page, Wrapper<TestDemo> wrapper) { default <P extends IPage<TestDemoVo>> P selectVoPage(IPage<TestDemo> page, Wrapper<TestDemo> wrapper) {
return selectVoPage(page, wrapper, this.currentVoClass()); return selectVoPage(page, wrapper, this.currentVoClass());
@ -40,8 +40,8 @@ public interface TestDemoMapper extends BaseMapperPlus<TestDemo, TestDemoVo> {
@Override @Override
@DataPermission({ @DataPermission({
@DataColumn(key = "deptName", value = "dept_id"), @DataColumn(key = "deptName", value = "create_dept"),
@DataColumn(key = "userName", value = "user_id") @DataColumn(key = "userName", value = "create_by")
}) })
default List<TestDemoVo> selectVoList(Wrapper<TestDemo> wrapper) { default List<TestDemoVo> selectVoList(Wrapper<TestDemo> wrapper) {
return selectVoList(wrapper, this.currentVoClass()); return selectVoList(wrapper, this.currentVoClass());
@ -49,15 +49,15 @@ public interface TestDemoMapper extends BaseMapperPlus<TestDemo, TestDemoVo> {
@Override @Override
@DataPermission(value = { @DataPermission(value = {
@DataColumn(key = "deptName", value = "dept_id"), @DataColumn(key = "deptName", value = "create_dept"),
@DataColumn(key = "userName", value = "user_id") @DataColumn(key = "userName", value = "create_by")
}, joinStr = "AND") }, joinStr = "AND")
List<TestDemo> selectByIds(@Param(Constants.COLL) Collection<? extends Serializable> idList); List<TestDemo> selectByIds(@Param(Constants.COLL) Collection<? extends Serializable> idList);
@Override @Override
@DataPermission({ @DataPermission({
@DataColumn(key = "deptName", value = "dept_id"), @DataColumn(key = "deptName", value = "create_dept"),
@DataColumn(key = "userName", value = "user_id") @DataColumn(key = "userName", value = "create_by")
}) })
int updateById(@Param(Constants.ENTITY) TestDemo entity); int updateById(@Param(Constants.ENTITY) TestDemo entity);

4
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TestTreeMapper.java
View File

@ -13,8 +13,8 @@ import org.dromara.demo.domain.vo.TestTreeVo;
* @date 2021-07-26 * @date 2021-07-26
*/ */
@DataPermission({ @DataPermission({
@DataColumn(key = "deptName", value = "dept_id"), @DataColumn(key = "deptName", value = "create_dept"),
@DataColumn(key = "userName", value = "user_id") @DataColumn(key = "userName", value = "create_by")
}) })
public interface TestTreeMapper extends BaseMapperPlus<TestTree, TestTreeVo> { public interface TestTreeMapper extends BaseMapperPlus<TestTree, TestTreeVo> {

6
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java
View File

@ -28,7 +28,7 @@ public interface SysDeptMapper extends BaseMapperPlus<SysDept, SysDeptVo> {
* @return 部门信息集合 * @return 部门信息集合
*/ */
@DataPermission({ @DataPermission({
@DataColumn(key = "deptName", value = "dept_id") @DataColumn(key = "deptName", value = "create_dept")
}) })
List<SysDeptVo> selectDeptList(@Param(Constants.WRAPPER) Wrapper<SysDept> queryWrapper); List<SysDeptVo> selectDeptList(@Param(Constants.WRAPPER) Wrapper<SysDept> queryWrapper);
@ -39,7 +39,7 @@ public interface SysDeptMapper extends BaseMapperPlus<SysDept, SysDeptVo> {
* @return 部门信息集合 * @return 部门信息集合
*/ */
@DataPermission({ @DataPermission({
@DataColumn(key = "deptName", value = "dept_id"), @DataColumn(key = "deptName", value = "create_dept"),
}) })
Page<SysDeptVo> selectPageDeptList(@Param("page") Page<SysDeptVo> page, @Param(Constants.WRAPPER) Wrapper<SysDept> queryWrapper); Page<SysDeptVo> selectPageDeptList(@Param("page") Page<SysDeptVo> page, @Param(Constants.WRAPPER) Wrapper<SysDept> queryWrapper);
@ -50,7 +50,7 @@ public interface SysDeptMapper extends BaseMapperPlus<SysDept, SysDeptVo> {
* @return 该部门ID的部门数量 * @return 该部门ID的部门数量
*/ */
@DataPermission({ @DataPermission({
@DataColumn(key = "deptName", value = "dept_id") @DataColumn(key = "deptName", value = "create_dept")
}) })
long countDeptById(Long deptId); long countDeptById(Long deptId);

2
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysPostMapper.java
View File

@ -27,7 +27,7 @@ public interface SysPostMapper extends BaseMapperPlus<SysPost, SysPostVo> {
* @return 包含岗位信息的分页结果 * @return 包含岗位信息的分页结果
*/ */
@DataPermission({ @DataPermission({
@DataColumn(key = "deptName", value = "dept_id"), @DataColumn(key = "deptName", value = "create_dept"),
@DataColumn(key = "userName", value = "create_by") @DataColumn(key = "userName", value = "create_by")
}) })
Page<SysPostVo> selectPagePostList(@Param("page") Page<SysPostVo> page, @Param(Constants.WRAPPER) Wrapper<SysPost> queryWrapper); Page<SysPostVo> selectPagePostList(@Param("page") Page<SysPostVo> page, @Param(Constants.WRAPPER) Wrapper<SysPost> queryWrapper);

6
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMapper.java
View File

@ -27,7 +27,7 @@ public interface SysRoleMapper extends BaseMapperPlus<SysRole, SysRoleVo> {
* @return 包含角色信息的分页结果 * @return 包含角色信息的分页结果
*/ */
@DataPermission({ @DataPermission({
@DataColumn(key = "deptName", value = "d.dept_id"), @DataColumn(key = "deptName", value = "d.create_dept"),
@DataColumn(key = "userName", value = "r.create_by") @DataColumn(key = "userName", value = "r.create_by")
}) })
Page<SysRoleVo> selectPageRoleList(@Param("page") Page<SysRole> page, @Param(Constants.WRAPPER) Wrapper<SysRole> queryWrapper); Page<SysRoleVo> selectPageRoleList(@Param("page") Page<SysRole> page, @Param(Constants.WRAPPER) Wrapper<SysRole> queryWrapper);
@ -39,7 +39,7 @@ public interface SysRoleMapper extends BaseMapperPlus<SysRole, SysRoleVo> {
* @return 角色数据集合信息 * @return 角色数据集合信息
*/ */
@DataPermission({ @DataPermission({
@DataColumn(key = "deptName", value = "d.dept_id"), @DataColumn(key = "deptName", value = "d.create_dept"),
@DataColumn(key = "userName", value = "r.create_by") @DataColumn(key = "userName", value = "r.create_by")
}) })
List<SysRoleVo> selectRoleList(@Param(Constants.WRAPPER) Wrapper<SysRole> queryWrapper); List<SysRoleVo> selectRoleList(@Param(Constants.WRAPPER) Wrapper<SysRole> queryWrapper);
@ -51,7 +51,7 @@ public interface SysRoleMapper extends BaseMapperPlus<SysRole, SysRoleVo> {
* @return 对应的角色信息 * @return 对应的角色信息
*/ */
@DataPermission({ @DataPermission({
@DataColumn(key = "deptName", value = "d.dept_id"), @DataColumn(key = "deptName", value = "d.create_dept"),
@DataColumn(key = "userName", value = "r.create_by") @DataColumn(key = "userName", value = "r.create_by")
}) })
SysRoleVo selectRoleById(Long roleId); SysRoleVo selectRoleById(Long roleId);

32
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java
View File

@ -28,8 +28,8 @@ public interface SysUserMapper extends BaseMapperPlus<SysUser, SysUserVo> {
* @return 分页的用户信息 * @return 分页的用户信息
*/ */
@DataPermission({ @DataPermission({
@DataColumn(key = "deptName", value = "u.dept_id"), @DataColumn(key = "deptName", value = "u.create_dept"),
@DataColumn(key = "userName", value = "u.user_id") @DataColumn(key = "userName", value = "u.create_by")
}) })
Page<SysUserVo> selectPageUserList(@Param("page") Page<SysUser> page, @Param(Constants.WRAPPER) Wrapper<SysUser> queryWrapper); Page<SysUserVo> selectPageUserList(@Param("page") Page<SysUser> page, @Param(Constants.WRAPPER) Wrapper<SysUser> queryWrapper);
@ -40,8 +40,8 @@ public interface SysUserMapper extends BaseMapperPlus<SysUser, SysUserVo> {
* @return 用户信息集合 * @return 用户信息集合
*/ */
@DataPermission({ @DataPermission({
@DataColumn(key = "deptName", value = "dept_id"), @DataColumn(key = "deptName", value = "create_dept"),
@DataColumn(key = "userName", value = "user_id") @DataColumn(key = "userName", value = "create_by")
}) })
List<SysUserVo> selectUserList(@Param(Constants.WRAPPER) Wrapper<SysUser> queryWrapper); List<SysUserVo> selectUserList(@Param(Constants.WRAPPER) Wrapper<SysUser> queryWrapper);
@ -52,8 +52,8 @@ public interface SysUserMapper extends BaseMapperPlus<SysUser, SysUserVo> {
* @return 用户信息集合信息 * @return 用户信息集合信息
*/ */
@DataPermission({ @DataPermission({
@DataColumn(key = "deptName", value = "d.dept_id"), @DataColumn(key = "deptName", value = "d.create_dept"),
@DataColumn(key = "userName", value = "u.user_id") @DataColumn(key = "userName", value = "u.create_by")
}) })
List<SysUserExportVo> selectUserExportList(@Param(Constants.WRAPPER) Wrapper<SysUser> queryWrapper); List<SysUserExportVo> selectUserExportList(@Param(Constants.WRAPPER) Wrapper<SysUser> queryWrapper);
@ -64,8 +64,8 @@ public interface SysUserMapper extends BaseMapperPlus<SysUser, SysUserVo> {
* @return 用户信息集合信息 * @return 用户信息集合信息
*/ */
@DataPermission({ @DataPermission({
@DataColumn(key = "deptName", value = "d.dept_id"), @DataColumn(key = "deptName", value = "d.create_dept"),
@DataColumn(key = "userName", value = "u.user_id") @DataColumn(key = "userName", value = "u.create_by")
}) })
Page<SysUserVo> selectAllocatedList(@Param("page") Page<SysUser> page, @Param(Constants.WRAPPER) Wrapper<SysUser> queryWrapper); Page<SysUserVo> selectAllocatedList(@Param("page") Page<SysUser> page, @Param(Constants.WRAPPER) Wrapper<SysUser> queryWrapper);
@ -76,8 +76,8 @@ public interface SysUserMapper extends BaseMapperPlus<SysUser, SysUserVo> {
* @return 用户信息集合信息 * @return 用户信息集合信息
*/ */
@DataPermission({ @DataPermission({
@DataColumn(key = "deptName", value = "d.dept_id"), @DataColumn(key = "deptName", value = "d.create_dept"),
@DataColumn(key = "userName", value = "u.user_id") @DataColumn(key = "userName", value = "u.create_by")
}) })
Page<SysUserVo> selectUnallocatedList(@Param("page") Page<SysUser> page, @Param(Constants.WRAPPER) Wrapper<SysUser> queryWrapper); Page<SysUserVo> selectUnallocatedList(@Param("page") Page<SysUser> page, @Param(Constants.WRAPPER) Wrapper<SysUser> queryWrapper);
@ -88,8 +88,8 @@ public interface SysUserMapper extends BaseMapperPlus<SysUser, SysUserVo> {
* @return 用户数量 * @return 用户数量
*/ */
@DataPermission({ @DataPermission({
@DataColumn(key = "deptName", value = "dept_id"), @DataColumn(key = "deptName", value = "create_dept"),
@DataColumn(key = "userName", value = "user_id") @DataColumn(key = "userName", value = "create_by")
}) })
long countUserById(Long userId); long countUserById(Long userId);
@ -102,8 +102,8 @@ public interface SysUserMapper extends BaseMapperPlus<SysUser, SysUserVo> {
*/ */
@Override @Override
@DataPermission({ @DataPermission({
@DataColumn(key = "deptName", value = "dept_id"), @DataColumn(key = "deptName", value = "create_dept"),
@DataColumn(key = "userName", value = "user_id") @DataColumn(key = "userName", value = "create_by")
}) })
int update(@Param(Constants.ENTITY) SysUser user, @Param(Constants.WRAPPER) Wrapper<SysUser> updateWrapper); int update(@Param(Constants.ENTITY) SysUser user, @Param(Constants.WRAPPER) Wrapper<SysUser> updateWrapper);
@ -115,8 +115,8 @@ public interface SysUserMapper extends BaseMapperPlus<SysUser, SysUserVo> {
*/ */
@Override @Override
@DataPermission({ @DataPermission({
@DataColumn(key = "deptName", value = "dept_id"), @DataColumn(key = "deptName", value = "create_dept"),
@DataColumn(key = "userName", value = "user_id") @DataColumn(key = "userName", value = "create_by")
}) })
int updateById(@Param(Constants.ENTITY) SysUser user); int updateById(@Param(Constants.ENTITY) SysUser user);