From 3890c0183aa1816699200c111893a3838c61f262 Mon Sep 17 00:00:00 2001 From: liangyong Date: Fri, 27 Jun 2025 15:01:49 +0800 Subject: [PATCH] =?UTF-8?q?refactor(ruoyi-common,=20ruoyi-modules):=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90=E6=B3=A8?= =?UTF-8?q?=E8=A7=A3=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将@DataColumn注解的key和value默认值改为需显式配置，并更新各Mapper中使用的数据权限字段从"dept_id"改为"create_dept"，从"user_id"改为"create_by"。 --- .../common/mybatis/annotation/DataColumn.java | 4 +-- .../dromara/demo/mapper/TestDemoMapper.java | 20 ++++++------ .../dromara/demo/mapper/TestTreeMapper.java | 4 +-- .../dromara/system/mapper/SysDeptMapper.java | 6 ++-- .../dromara/system/mapper/SysPostMapper.java | 4 +-- .../dromara/system/mapper/SysRoleMapper.java | 6 ++-- .../dromara/system/mapper/SysUserMapper.java | 32 +++++++++---------- 7 files changed, 38 insertions(+), 38 deletions(-) diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/annotation/DataColumn.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/annotation/DataColumn.java index 2879b9d1c..53b18ba85 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/annotation/DataColumn.java +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/annotation/DataColumn.java @@ -21,14 +21,14 @@ public @interface DataColumn { * * @return 占位符关键字数组 */ - String[] key() default "deptName"; + String[] key(); /** * 数据权限模板的占位符替换值，默认为 "dept_id" * * @return 占位符替换值数组 */ - String[] value() default "dept_id"; + String[] value(); /** * 权限标识符 用于通过菜单权限标识符来获取数据权限 diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TestDemoMapper.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TestDemoMapper.java index 19b2d52df..c578a45dd 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TestDemoMapper.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TestDemoMapper.java @@ -24,15 +24,15 @@ import java.util.List; public interface TestDemoMapper extends BaseMapperPlus { @DataPermission({ - @DataColumn(key = "deptName", value = "dept_id"), - @DataColumn(key = "userName", value = "user_id") + @DataColumn(key = "deptName", value = "create_dept"), + @DataColumn(key = "userName", value = "create_by") }) Page customPageList(@Param("page") Page page, @Param("ew") Wrapper wrapper); @Override @DataPermission({ - @DataColumn(key = "deptName", value = "dept_id"), - @DataColumn(key = "userName", value = "user_id") + @DataColumn(key = "deptName", value = "create_dept"), + @DataColumn(key = "userName", value = "create_by") }) default

> P selectVoPage(IPage page, Wrapper wrapper) { return selectVoPage(page, wrapper, this.currentVoClass()); @@ -40,8 +40,8 @@ public interface TestDemoMapper extends BaseMapperPlus { @Override @DataPermission({ - @DataColumn(key = "deptName", value = "dept_id"), - @DataColumn(key = "userName", value = "user_id") + @DataColumn(key = "deptName", value = "create_dept"), + @DataColumn(key = "userName", value = "create_by") }) default List selectVoList(Wrapper wrapper) { return selectVoList(wrapper, this.currentVoClass()); @@ -49,15 +49,15 @@ public interface TestDemoMapper extends BaseMapperPlus { @Override @DataPermission(value = { - @DataColumn(key = "deptName", value = "dept_id"), - @DataColumn(key = "userName", value = "user_id") + @DataColumn(key = "deptName", value = "create_dept"), + @DataColumn(key = "userName", value = "create_by") }, joinStr = "AND") List selectByIds(@Param(Constants.COLL) Collection idList); @Override @DataPermission({ - @DataColumn(key = "deptName", value = "dept_id"), - @DataColumn(key = "userName", value = "user_id") + @DataColumn(key = "deptName", value = "create_dept"), + @DataColumn(key = "userName", value = "create_by") }) int updateById(@Param(Constants.ENTITY) TestDemo entity); diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TestTreeMapper.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TestTreeMapper.java index e5f4c443b..1ee93031e 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TestTreeMapper.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TestTreeMapper.java @@ -13,8 +13,8 @@ import org.dromara.demo.domain.vo.TestTreeVo; * @date 2021-07-26 */ @DataPermission({ - @DataColumn(key = "deptName", value = "dept_id"), - @DataColumn(key = "userName", value = "user_id") + @DataColumn(key = "deptName", value = "create_dept"), + @DataColumn(key = "userName", value = "create_by") }) public interface TestTreeMapper extends BaseMapperPlus { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java index b69624cf0..e232ec4a0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java @@ -28,7 +28,7 @@ public interface SysDeptMapper extends BaseMapperPlus { * @return 部门信息集合 */ @DataPermission({ - @DataColumn(key = "deptName", value = "dept_id") + @DataColumn(key = "deptName", value = "create_dept") }) List selectDeptList(@Param(Constants.WRAPPER) Wrapper queryWrapper); @@ -39,7 +39,7 @@ public interface SysDeptMapper extends BaseMapperPlus { * @return 部门信息集合 */ @DataPermission({ - @DataColumn(key = "deptName", value = "dept_id"), + @DataColumn(key = "deptName", value = "create_dept"), }) Page selectPageDeptList(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper); @@ -50,7 +50,7 @@ public interface SysDeptMapper extends BaseMapperPlus { * @return 该部门ID的部门数量 */ @DataPermission({ - @DataColumn(key = "deptName", value = "dept_id") + @DataColumn(key = "deptName", value = "create_dept") }) long countDeptById(Long deptId); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysPostMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysPostMapper.java index 60da074c7..b8ff6d04b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysPostMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysPostMapper.java @@ -27,8 +27,8 @@ public interface SysPostMapper extends BaseMapperPlus { * @return 包含岗位信息的分页结果 */ @DataPermission({ - @DataColumn(key = "deptName", value = "dept_id"), - @DataColumn(key = "userName", value = "create_by") + @DataColumn(key = "deptName", value = "create_dept"), + @DataColumn(key = "userName", value = "create_by") }) Page selectPagePostList(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMapper.java index 9cb1ea509..6caeba6fe 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMapper.java @@ -27,7 +27,7 @@ public interface SysRoleMapper extends BaseMapperPlus { * @return 包含角色信息的分页结果 */ @DataPermission({ - @DataColumn(key = "deptName", value = "d.dept_id"), + @DataColumn(key = "deptName", value = "d.create_dept"), @DataColumn(key = "userName", value = "r.create_by") }) Page selectPageRoleList(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper); @@ -39,7 +39,7 @@ public interface SysRoleMapper extends BaseMapperPlus { * @return 角色数据集合信息 */ @DataPermission({ - @DataColumn(key = "deptName", value = "d.dept_id"), + @DataColumn(key = "deptName", value = "d.create_dept"), @DataColumn(key = "userName", value = "r.create_by") }) List selectRoleList(@Param(Constants.WRAPPER) Wrapper queryWrapper); @@ -51,7 +51,7 @@ public interface SysRoleMapper extends BaseMapperPlus { * @return 对应的角色信息 */ @DataPermission({ - @DataColumn(key = "deptName", value = "d.dept_id"), + @DataColumn(key = "deptName", value = "d.create_dept"), @DataColumn(key = "userName", value = "r.create_by") }) SysRoleVo selectRoleById(Long roleId); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java index 46695aa4c..2c8d38e44 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java @@ -28,8 +28,8 @@ public interface SysUserMapper extends BaseMapperPlus { * @return 分页的用户信息 */ @DataPermission({ - @DataColumn(key = "deptName", value = "u.dept_id"), - @DataColumn(key = "userName", value = "u.user_id") + @DataColumn(key = "deptName", value = "u.create_dept"), + @DataColumn(key = "userName", value = "u.create_by") }) Page selectPageUserList(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper); @@ -40,8 +40,8 @@ public interface SysUserMapper extends BaseMapperPlus { * @return 用户信息集合 */ @DataPermission({ - @DataColumn(key = "deptName", value = "dept_id"), - @DataColumn(key = "userName", value = "user_id") + @DataColumn(key = "deptName", value = "create_dept"), + @DataColumn(key = "userName", value = "create_by") }) List selectUserList(@Param(Constants.WRAPPER) Wrapper queryWrapper); @@ -52,8 +52,8 @@ public interface SysUserMapper extends BaseMapperPlus { * @return 用户信息集合信息 */ @DataPermission({ - @DataColumn(key = "deptName", value = "d.dept_id"), - @DataColumn(key = "userName", value = "u.user_id") + @DataColumn(key = "deptName", value = "d.create_dept"), + @DataColumn(key = "userName", value = "u.create_by") }) List selectUserExportList(@Param(Constants.WRAPPER) Wrapper queryWrapper); @@ -64,8 +64,8 @@ public interface SysUserMapper extends BaseMapperPlus { * @return 用户信息集合信息 */ @DataPermission({ - @DataColumn(key = "deptName", value = "d.dept_id"), - @DataColumn(key = "userName", value = "u.user_id") + @DataColumn(key = "deptName", value = "d.create_dept"), + @DataColumn(key = "userName", value = "u.create_by") }) Page selectAllocatedList(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper); @@ -76,8 +76,8 @@ public interface SysUserMapper extends BaseMapperPlus { * @return 用户信息集合信息 */ @DataPermission({ - @DataColumn(key = "deptName", value = "d.dept_id"), - @DataColumn(key = "userName", value = "u.user_id") + @DataColumn(key = "deptName", value = "d.create_dept"), + @DataColumn(key = "userName", value = "u.create_by") }) Page selectUnallocatedList(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper); @@ -88,8 +88,8 @@ public interface SysUserMapper extends BaseMapperPlus { * @return 用户数量 */ @DataPermission({ - @DataColumn(key = "deptName", value = "dept_id"), - @DataColumn(key = "userName", value = "user_id") + @DataColumn(key = "deptName", value = "create_dept"), + @DataColumn(key = "userName", value = "create_by") }) long countUserById(Long userId); @@ -102,8 +102,8 @@ public interface SysUserMapper extends BaseMapperPlus { */ @Override @DataPermission({ - @DataColumn(key = "deptName", value = "dept_id"), - @DataColumn(key = "userName", value = "user_id") + @DataColumn(key = "deptName", value = "create_dept"), + @DataColumn(key = "userName", value = "create_by") }) int update(@Param(Constants.ENTITY) SysUser user, @Param(Constants.WRAPPER) Wrapper updateWrapper); @@ -115,8 +115,8 @@ public interface SysUserMapper extends BaseMapperPlus { */ @Override @DataPermission({ - @DataColumn(key = "deptName", value = "dept_id"), - @DataColumn(key = "userName", value = "user_id") + @DataColumn(key = "deptName", value = "create_dept"), + @DataColumn(key = "userName", value = "create_by") }) int updateById(@Param(Constants.ENTITY) SysUser user); -- Gitee