From 2787212362c5a23bf5dd94b1bb9cae4ec3fe4caa Mon Sep 17 00:00:00 2001 From: MichelleChung <1242874891@qq.com> Date: 星期五, 03 二月 2023 09:47:41 +0800 Subject: [PATCH] !284 更新常量 GenConstants,优化 Map 返回结构 * update 优化返回结构, 将 Map 改为指定 Vo 对象 ; * update GenConstants 扩展数据库数据类型, 更新 BO, VO, ENTITY 字段, 并移动到 generator 模块 ; --- ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java index 84e38f0..c6d0ad4 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java @@ -7,6 +7,7 @@ import com.ruoyi.common.mybatis.annotation.DataPermission; import com.ruoyi.system.domain.SysRole; import com.ruoyi.common.mybatis.core.mapper.BaseMapperPlus; +import com.ruoyi.system.domain.vo.SysRoleVo; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -16,12 +17,12 @@ * * @author Lion Li */ -public interface SysRoleMapper extends BaseMapperPlus<SysRoleMapper, SysRole, SysRole> { +public interface SysRoleMapper extends BaseMapperPlus<SysRoleMapper, SysRole, SysRoleVo> { @DataPermission({ @DataColumn(key = "deptName", value = "d.dept_id") }) - Page<SysRole> 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); /** * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ瑙掕壊鏁版嵁 @@ -32,7 +33,7 @@ @DataPermission({ @DataColumn(key = "deptName", value = "d.dept_id") }) - List<SysRole> selectRoleList(@Param(Constants.WRAPPER) Wrapper<SysRole> queryWrapper); + List<SysRoleVo> selectRoleList(@Param(Constants.WRAPPER) Wrapper<SysRole> queryWrapper); /** * 鏍规嵁鐢ㄦ埛ID鏌ヨ瑙掕壊 @@ -40,7 +41,7 @@ * @param userId 鐢ㄦ埛ID * @return 瑙掕壊鍒楄〃 */ - List<SysRole> selectRolePermissionByUserId(Long userId); + List<SysRoleVo> selectRolePermissionByUserId(Long userId); /** @@ -57,6 +58,6 @@ * @param userName 鐢ㄦ埛鍚� * @return 瑙掕壊鍒楄〃 */ - List<SysRole> selectRolesByUserName(String userName); + List<SysRoleVo> selectRolesByUserName(String userName); } -- Gitblit v1.9.3