[重大更新] 集成 mybatis-plus-join 重构项目代码(实验性功能不稳定)

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysRoleMenuPermVo.java

@@ -0,0 +1,20 @@
+package org.dromara.system.domain.vo;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 角色菜单权限视图
+ */
+@Data
+public class SysRoleMenuPermVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    private Long roleId;
+
+    private String perms;
+}

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

@@ -3,15 +3,21 @@ package org.dromara.system.mapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.toolkit.JoinWrappers;
 import org.dromara.common.core.utils.StreamUtils;
 import org.dromara.common.mybatis.annotation.DataColumn;
 import org.dromara.common.mybatis.annotation.DataPermission;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.dromara.common.mybatis.helper.DataBaseHelper;
 import org.dromara.system.domain.SysDept;
+import org.dromara.system.domain.SysRole;
+import org.dromara.system.domain.SysRoleDept;
 import org.dromara.system.domain.vo.SysDeptVo;
 
+import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 /**
  * 部门管理 数据层
@@ -20,42 +26,6 @@ import java.util.List;
  */
 public interface SysDeptMapper extends BaseMapperPlus<SysDept, SysDeptVo> {
 
-    /**
-     * 构建角色对应的部门 SQL 查询语句
-     *
-     * <p>该 SQL 用于查询某个角色关联的所有部门 ID，常用于数据权限控制</p>
-     *
-     * @param roleId 角色ID
-     * @return 查询部门ID的 SQL 语句字符串
-     */
-    default String buildDeptByRoleSql(Long roleId) {
-        return """
-                select srd.dept_id from sys_role_dept srd
-                    left join sys_role sr on sr.role_id = srd.role_id
-                    where srd.role_id = %d and sr.status = '0'
-            """.formatted(roleId);
-    }
-
-    /**
-     * 构建 SQL 查询，用于获取当前角色拥有的部门中所有的父部门ID
-     *
-     * <p>
-     * 该 SQL 用于 deptCheckStrictly 场景下，排除非叶子节点（父节点）用。
-     * </p>
-     *
-     * @param roleId 角色ID
-     * @return SQL 语句字符串，查询角色下部门的所有父部门ID
-     */
-    default String buildParentDeptByRoleSql(Long roleId) {
-        return """
-                select parent_id from sys_dept where dept_id in (
-                    select srd.dept_id from sys_role_dept srd
-                        left join sys_role sr on sr.role_id = srd.role_id
-                        where srd.role_id = %d and sr.status = '0'
-                )
-            """.formatted(roleId);
-    }
-
     /**
      * 查询部门管理数据
      *
@@ -129,15 +99,20 @@ public interface SysDeptMapper extends BaseMapperPlus<SysDept, SysDeptVo> {
      * @return 选中部门列表
      */
     default List<Long> selectDeptListByRoleId(Long roleId, boolean deptCheckStrictly) {
-        LambdaQueryWrapper<SysDept> wrapper = new LambdaQueryWrapper<>();
-        wrapper.select(SysDept::getDeptId)
-            .inSql(SysDept::getDeptId, this.buildDeptByRoleSql(roleId))
-            .orderByAsc(SysDept::getParentId)
-            .orderByAsc(SysDept::getOrderNum);
-        if (deptCheckStrictly) {
-            wrapper.notInSql(SysDept::getDeptId, this.buildParentDeptByRoleSql(roleId));
-        }
-        return this.selectObjs(wrapper);
+        List<SysDept> depts = this.selectJoinList(SysDept.class, JoinWrappers.lambda("d", SysDept.class)
+            .distinct()
+            .select(SysDept::getDeptId, SysDept::getParentId)
+            .leftJoin(SysRoleDept.class, "srd", SysRoleDept::getDeptId, SysDept::getDeptId)
+            .leftJoin(SysRole.class, "sr", SysRole::getRoleId, SysRoleDept::getRoleId)
+            .eq("srd", SysRoleDept::getRoleId, roleId)
+            .eq("sr", SysRole::getStatus, "0")
+            .orderByAsc("d", SysDept::getParentId)
+            .orderByAsc("d", SysDept::getOrderNum));
+        Set<Long> parentIds = deptCheckStrictly ? new HashSet<>(StreamUtils.toList(depts, SysDept::getParentId)) : Collections.emptySet();
+        return depts.stream()
+            .map(SysDept::getDeptId)
+            .filter(deptId -> !parentIds.contains(deptId))
+            .toList();
     }
 
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysMenuMapper.java

@@ -2,11 +2,17 @@ package org.dromara.system.mapper;
 
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.github.yulichang.toolkit.JoinWrappers;
 import org.dromara.common.core.constant.SystemConstants;
 import org.dromara.common.core.utils.StreamUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.dromara.system.domain.SysMenu;
+import org.dromara.system.domain.SysRole;
+import org.dromara.system.domain.SysRoleMenu;
+import org.dromara.system.domain.SysUserRole;
+import org.dromara.system.domain.bo.SysMenuBo;
+import org.dromara.system.domain.vo.SysRoleMenuPermVo;
 import org.dromara.system.domain.vo.SysMenuVo;
 
 import java.util.*;
@@ -18,66 +24,6 @@ import java.util.*;
  */
 public interface SysMenuMapper extends BaseMapperPlus<SysMenu, SysMenuVo> {
 
-    /**
-     * 构建用户权限菜单 SQL
-     *
-     * <p>
-     * 查询用户所属角色所拥有的菜单权限，用于权限判断、菜单加载等场景
-     * </p>
-     *
-     * @param userId 用户ID
-     * @return SQL 字符串，用于 inSql 条件
-     */
-    default String buildMenuByUserSql(Long userId) {
-        return """
-                select menu_id from sys_role_menu where role_id in (
-                    select sur.role_id from sys_user_role sur
-                        left join sys_role sr on sr.role_id = sur.role_id
-                        where sur.user_id = %d and sr.status = '0'
-                )
-            """.formatted(userId);
-    }
-
-    /**
-     * 构建角色对应的菜单ID SQL 子查询
-     *
-     * <p>
-     * 用于根据角色ID查询其所拥有的菜单权限（用于权限标识、菜单显示等场景）
-     * 通常配合 inSql 使用
-     * </p>
-     *
-     * @param roleId 角色ID
-     * @return 查询菜单ID的 SQL 子查询字符串
-     */
-    default String buildMenuByRoleSql(Long roleId) {
-        return """
-                select srm.menu_id from sys_role_menu srm
-                    left join sys_role sr on sr.role_id = srm.role_id
-                    where srm.role_id = %d and sr.status = '0'
-            """.formatted(roleId);
-    }
-
-    /**
-     * 构建角色所关联菜单的父菜单ID查询 SQL
-     *
-     * <p>
-     * 用于配合菜单勾选树结构的 {@code menuCheckStrictly} 模式，过滤掉非叶子节点（父菜单），
-     * 只返回角色实际勾选的末级菜单
-     * </p>
-     *
-     * @param roleId 角色ID
-     * @return SQL 语句字符串（查询菜单的父菜单ID）
-     */
-    default String buildParentMenuByRoleSql(Long roleId) {
-        return """
-                select parent_id from sys_menu where menu_id in (
-                    select srm.menu_id from sys_role_menu srm
-                        left join sys_role sr on sr.role_id = srm.role_id
-                        where srm.role_id = %d and sr.status = '0'
-                )
-            """.formatted(roleId);
-    }
-
     /**
      * 根据用户ID查询权限
      *
@@ -85,13 +31,16 @@ public interface SysMenuMapper extends BaseMapperPlus<SysMenu, SysMenuVo> {
      * @return 权限列表
      */
     default Set<String> selectMenuPermsByUserId(Long userId) {
-        List<String> list = this.selectObjs(
-            new LambdaQueryWrapper<SysMenu>()
-                .select(SysMenu::getPerms)
-                .inSql(SysMenu::getMenuId, this.buildMenuByUserSql(userId))
-                .isNotNull(SysMenu::getPerms)
-        );
-        return new HashSet<>(StreamUtils.filter(list, StringUtils::isNotBlank));
+        List<SysMenu> list = this.selectJoinList(SysMenu.class, JoinWrappers.lambda("m", SysMenu.class)
+            .distinct()
+            .select(SysMenu::getPerms)
+            .leftJoin(SysRoleMenu.class, "srm", SysRoleMenu::getMenuId, SysMenu::getMenuId)
+            .leftJoin(SysUserRole.class, "sur", SysUserRole::getRoleId, SysRoleMenu::getRoleId)
+            .leftJoin(SysRole.class, "sr", SysRole::getRoleId, SysRoleMenu::getRoleId)
+            .eq("sur", SysUserRole::getUserId, userId)
+            .eq("sr", SysRole::getStatus, SystemConstants.NORMAL)
+            .isNotNull("m", SysMenu::getPerms));
+        return new HashSet<>(StreamUtils.filter(StreamUtils.toList(list, SysMenu::getPerms), StringUtils::isNotBlank));
     }
 
     /**
@@ -101,13 +50,15 @@ public interface SysMenuMapper extends BaseMapperPlus<SysMenu, SysMenuVo> {
      * @return 权限列表
      */
     default Set<String> selectMenuPermsByRoleId(Long roleId) {
-        List<String> list = this.selectObjs(
-            new LambdaQueryWrapper<SysMenu>()
-                .select(SysMenu::getPerms)
-                .inSql(SysMenu::getMenuId, this.buildMenuByRoleSql(roleId))
-                .isNotNull(SysMenu::getPerms)
-        );
-        return new HashSet<>(StreamUtils.filter(list, StringUtils::isNotBlank));
+        List<SysMenu> list = this.selectJoinList(SysMenu.class, JoinWrappers.lambda("m", SysMenu.class)
+            .distinct()
+            .select(SysMenu::getPerms)
+            .leftJoin(SysRoleMenu.class, "srm", SysRoleMenu::getMenuId, SysMenu::getMenuId)
+            .leftJoin(SysRole.class, "sr", SysRole::getRoleId, SysRoleMenu::getRoleId)
+            .eq("srm", SysRoleMenu::getRoleId, roleId)
+            .eq("sr", SysRole::getStatus, SystemConstants.NORMAL)
+            .isNotNull("m", SysMenu::getPerms));
+        return new HashSet<>(StreamUtils.filter(StreamUtils.toList(list, SysMenu::getPerms), StringUtils::isNotBlank));
     }
 
     /**
@@ -120,8 +71,22 @@ public interface SysMenuMapper extends BaseMapperPlus<SysMenu, SysMenuVo> {
         if (CollUtil.isEmpty(roleIds)) {
             return Map.of();
         }
+        List<SysRoleMenuPermVo> list = this.selectJoinList(SysRoleMenuPermVo.class, JoinWrappers.lambda("m", SysMenu.class)
+            .distinct()
+            .selectAs("srm", SysRoleMenu::getRoleId, SysRoleMenuPermVo::getRoleId)
+            .selectAs(SysMenu::getPerms, SysRoleMenuPermVo::getPerms)
+            .leftJoin(SysRoleMenu.class, "srm", SysRoleMenu::getMenuId, SysMenu::getMenuId)
+            .leftJoin(SysRole.class, "sr", SysRole::getRoleId, SysRoleMenu::getRoleId)
+            .in("srm", SysRoleMenu::getRoleId, roleIds)
+            .eq("sr", SysRole::getStatus, SystemConstants.NORMAL)
+            .isNotNull("m", SysMenu::getPerms));
         Map<Long, Set<String>> result = new LinkedHashMap<>();
-        roleIds.forEach(roleId -> result.put(roleId, this.selectMenuPermsByRoleId(roleId)));
+        for (SysRoleMenuPermVo item : list) {
+            if (StringUtils.isBlank(item.getPerms())) {
+                continue;
+            }
+            result.computeIfAbsent(item.getRoleId(), key -> new LinkedHashSet<>()).add(item.getPerms());
+        }
         return result;
     }
 
@@ -147,15 +112,53 @@ public interface SysMenuMapper extends BaseMapperPlus<SysMenu, SysMenuVo> {
      * @return 选中菜单列表
      */
     default List<Long> selectMenuListByRoleId(Long roleId, boolean menuCheckStrictly) {
-        LambdaQueryWrapper<SysMenu> wrapper = new LambdaQueryWrapper<>();
-        wrapper.select(SysMenu::getMenuId)
-            .inSql(SysMenu::getMenuId, buildMenuByRoleSql(roleId))
-            .orderByAsc(SysMenu::getParentId)
-            .orderByAsc(SysMenu::getOrderNum);
-        if (menuCheckStrictly) {
-            wrapper.notInSql(SysMenu::getMenuId, this.buildParentMenuByRoleSql(roleId));
-        }
-        return this.selectObjs(wrapper);
+        List<SysMenu> menus = this.selectJoinList(SysMenu.class, JoinWrappers.lambda("m", SysMenu.class)
+            .distinct()
+            .select(SysMenu::getMenuId, SysMenu::getParentId)
+            .leftJoin(SysRoleMenu.class, "srm", SysRoleMenu::getMenuId, SysMenu::getMenuId)
+            .leftJoin(SysRole.class, "sr", SysRole::getRoleId, SysRoleMenu::getRoleId)
+            .eq("srm", SysRoleMenu::getRoleId, roleId)
+            .eq("sr", SysRole::getStatus, SystemConstants.NORMAL)
+            .orderByAsc("m", SysMenu::getParentId)
+            .orderByAsc("m", SysMenu::getOrderNum));
+        Set<Long> parentIds = menuCheckStrictly ? new HashSet<>(StreamUtils.toList(menus, SysMenu::getParentId)) : Collections.emptySet();
+        return menus.stream()
+            .map(SysMenu::getMenuId)
+            .filter(menuId -> !parentIds.contains(menuId))
+            .toList();
+    }
+
+    default List<SysMenuVo> selectMenuListByUserId(SysMenuBo menu, Long userId) {
+        return this.selectJoinList(SysMenuVo.class, JoinWrappers.lambda("m", SysMenu.class)
+            .distinct()
+            .selectAll(SysMenu.class)
+            .leftJoin(SysRoleMenu.class, "srm", SysRoleMenu::getMenuId, SysMenu::getMenuId)
+            .leftJoin(SysUserRole.class, "sur", SysUserRole::getRoleId, SysRoleMenu::getRoleId)
+            .leftJoin(SysRole.class, "sr", SysRole::getRoleId, SysRoleMenu::getRoleId)
+            .eq("sur", SysUserRole::getUserId, userId)
+            .eq("sr", SysRole::getStatus, SystemConstants.NORMAL)
+            .like(StringUtils.isNotBlank(menu.getMenuName()), "m", SysMenu::getMenuName, menu.getMenuName())
+            .eq(StringUtils.isNotBlank(menu.getVisible()), "m", SysMenu::getVisible, menu.getVisible())
+            .eq(StringUtils.isNotBlank(menu.getStatus()), "m", SysMenu::getStatus, menu.getStatus())
+            .eq(StringUtils.isNotBlank(menu.getMenuType()), "m", SysMenu::getMenuType, menu.getMenuType())
+            .eq(Objects.nonNull(menu.getParentId()), "m", SysMenu::getParentId, menu.getParentId())
+            .orderByAsc("m", SysMenu::getParentId)
+            .orderByAsc("m", SysMenu::getOrderNum));
+    }
+
+    default List<SysMenu> selectMenuTreeByUserId(Long userId) {
+        return this.selectJoinList(SysMenu.class, JoinWrappers.lambda("m", SysMenu.class)
+            .distinct()
+            .selectAll(SysMenu.class)
+            .leftJoin(SysRoleMenu.class, "srm", SysRoleMenu::getMenuId, SysMenu::getMenuId)
+            .leftJoin(SysUserRole.class, "sur", SysUserRole::getRoleId, SysRoleMenu::getRoleId)
+            .leftJoin(SysRole.class, "sr", SysRole::getRoleId, SysRoleMenu::getRoleId)
+            .eq("sur", SysUserRole::getUserId, userId)
+            .eq("sr", SysRole::getStatus, SystemConstants.NORMAL)
+            .in("m", SysMenu::getMenuType, SystemConstants.TYPE_DIR, SystemConstants.TYPE_MENU)
+            .eq("m", SysMenu::getStatus, SystemConstants.NORMAL)
+            .orderByAsc("m", SysMenu::getParentId)
+            .orderByAsc("m", SysMenu::getOrderNum));
     }
 
 }

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

@@ -3,10 +3,12 @@ package org.dromara.system.mapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.toolkit.JoinWrappers;
 import org.dromara.common.mybatis.annotation.DataColumn;
 import org.dromara.common.mybatis.annotation.DataPermission;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.dromara.system.domain.SysPost;
+import org.dromara.system.domain.SysUserPost;
 import org.dromara.system.domain.vo.SysPostVo;
 
 import java.util.List;
@@ -68,8 +70,10 @@ public interface SysPostMapper extends BaseMapperPlus<SysPost, SysPostVo> {
      * @return 岗位信息列表
      */
     default List<SysPostVo> selectPostsByUserId(Long userId) {
-        return this.selectVoList(new LambdaQueryWrapper<SysPost>()
-            .inSql(SysPost::getPostId, "select post_id from sys_user_post where user_id = " + userId));
+        return this.selectJoinList(SysPostVo.class, JoinWrappers.lambda("p", SysPost.class)
+            .selectAll(SysPost.class)
+            .leftJoin(SysUserPost.class, "sup", SysUserPost::getPostId, SysPost::getPostId)
+            .eq("sup", SysUserPost::getUserId, userId));
     }
 
 }

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

@@ -4,11 +4,13 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.toolkit.JoinWrappers;
 import org.apache.ibatis.annotations.Param;
 import org.dromara.common.mybatis.annotation.DataColumn;
 import org.dromara.common.mybatis.annotation.DataPermission;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.dromara.system.domain.SysRole;
+import org.dromara.system.domain.SysUserRole;
 import org.dromara.system.domain.vo.SysRoleVo;
 
 import java.util.List;
@@ -20,18 +22,6 @@ import java.util.List;
  */
 public interface SysRoleMapper extends BaseMapperPlus<SysRole, SysRoleVo> {
 
-    /**
-     * 构建根据用户ID查询角色ID的SQL子查询
-     *
-     * @param userId 用户ID
-     * @return 查询用户对应角色ID的SQL语句字符串
-     */
-    default String buildRoleByUserSql(Long userId) {
-        return """
-                select role_id from sys_user_role where user_id = %d
-            """.formatted(userId);
-    }
-
     /**
      * 分页查询角色列表
      *
@@ -96,10 +86,11 @@ public interface SysRoleMapper extends BaseMapperPlus<SysRole, SysRoleVo> {
      * @return 角色列表
      */
     default List<SysRoleVo> selectRolesByUserId(Long userId) {
-        return this.selectVoList(new LambdaQueryWrapper<SysRole>()
+        return this.selectJoinList(SysRoleVo.class, JoinWrappers.lambda("r", SysRole.class)
             .select(SysRole::getRoleId, SysRole::getRoleName, SysRole::getRoleKey,
                 SysRole::getRoleSort, SysRole::getDataScope, SysRole::getStatus)
-            .inSql(SysRole::getRoleId, this.buildRoleByUserSql(userId)));
+            .leftJoin(SysUserRole.class, "sur", SysUserRole::getRoleId, SysRole::getRoleId)
+            .eq("sur", SysUserRole::getUserId, userId));
     }
 
 }

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

@@ -4,11 +4,19 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.toolkit.JoinWrappers;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import org.apache.ibatis.annotations.Param;
+import org.dromara.common.core.constant.SystemConstants;
+import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.annotation.DataColumn;
 import org.dromara.common.mybatis.annotation.DataPermission;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.system.domain.SysDept;
+import org.dromara.system.domain.SysRole;
 import org.dromara.system.domain.SysUser;
+import org.dromara.system.domain.SysUserRole;
+import org.dromara.system.domain.bo.SysUserBo;
 import org.dromara.system.domain.vo.SysUserExportVo;
 import org.dromara.system.domain.vo.SysUserVo;
 
@@ -60,7 +68,24 @@ public interface SysUserMapper extends BaseMapperPlus<SysUser, SysUserVo> {
         @DataColumn(key = "deptName", value = "d.dept_id"),
         @DataColumn(key = "userName", value = "u.create_by")
     })
-    List<SysUserExportVo> selectUserExportList(@Param(Constants.WRAPPER) Wrapper<SysUser> queryWrapper);
+    default List<SysUserExportVo> selectUserExportList(SysUserBo user, List<Long> deptIds) {
+        MPJLambdaWrapper<SysUser> wrapper = JoinWrappers.lambda("u", SysUser.class)
+            .selectAll(SysUser.class)
+            .selectAs(SysDept::getDeptName, SysUserExportVo::getDeptName)
+            .selectAs("u1", SysUser::getUserName, SysUserExportVo::getLeaderName)
+            .leftJoin(SysDept.class, "d", SysDept::getDeptId, SysUser::getDeptId)
+            .leftJoin(SysUser.class, "u1", SysUser::getUserId, SysDept::getLeader)
+            .eq("u", SysUser::getDelFlag, SystemConstants.NORMAL)
+            .like(StringUtils.isNotBlank(user.getUserName()), "u", SysUser::getUserName, user.getUserName())
+            .like(StringUtils.isNotBlank(user.getNickName()), "u", SysUser::getNickName, user.getNickName())
+            .eq(StringUtils.isNotBlank(user.getStatus()), "u", SysUser::getStatus, user.getStatus())
+            .like(StringUtils.isNotBlank(user.getPhonenumber()), "u", SysUser::getPhonenumber, user.getPhonenumber())
+            .between(user.getParams().get("beginTime") != null && user.getParams().get("endTime") != null,
+                "u", SysUser::getCreateTime, user.getParams().get("beginTime"), user.getParams().get("endTime"))
+            .in(deptIds != null && !deptIds.isEmpty(), "u", SysUser::getDeptId, deptIds)
+            .orderByAsc("u", SysUser::getUserId);
+        return this.selectJoinList(SysUserExportVo.class, wrapper);
+    }
 
     /**
      * 根据条件分页查询已配用户角色列表
@@ -73,7 +98,12 @@ public interface SysUserMapper extends BaseMapperPlus<SysUser, SysUserVo> {
         @DataColumn(key = "deptName", value = "d.dept_id"),
         @DataColumn(key = "userName", value = "u.create_by")
     })
-    Page<SysUserVo> selectAllocatedList(@Param("page") Page<SysUser> page, @Param(Constants.WRAPPER) Wrapper<SysUser> queryWrapper);
+    default Page<SysUserVo> selectAllocatedList(Page<SysUserVo> page, SysUserBo user) {
+        MPJLambdaWrapper<SysUser> wrapper = this.buildUserRoleJoinWrapper(user)
+            .eq(user.getRoleId() != null, "r", SysRole::getRoleId, user.getRoleId())
+            .orderByAsc("u", SysUser::getUserId);
+        return this.selectJoinPage(page, SysUserVo.class, wrapper);
+    }
 
     /**
      * 根据条件分页查询未分配用户角色列表
@@ -85,7 +115,12 @@ public interface SysUserMapper extends BaseMapperPlus<SysUser, SysUserVo> {
         @DataColumn(key = "deptName", value = "d.dept_id"),
         @DataColumn(key = "userName", value = "u.create_by")
     })
-    Page<SysUserVo> selectUnallocatedList(@Param("page") Page<SysUser> page, @Param(Constants.WRAPPER) Wrapper<SysUser> queryWrapper);
+    default Page<SysUserVo> selectUnallocatedList(Page<SysUserVo> page, SysUserBo user, List<Long> userIds) {
+        MPJLambdaWrapper<SysUser> wrapper = this.buildUserRoleJoinWrapper(user)
+            .notIn(userIds != null && !userIds.isEmpty(), "u", SysUser::getUserId, userIds)
+            .orderByAsc("u", SysUser::getUserId);
+        return this.selectJoinPage(page, SysUserVo.class, wrapper);
+    }
 
     /**
      * 根据用户ID统计用户数量
@@ -128,4 +163,17 @@ public interface SysUserMapper extends BaseMapperPlus<SysUser, SysUserVo> {
     })
     int updateById(@Param(Constants.ENTITY) SysUser user);
 
+    private MPJLambdaWrapper<SysUser> buildUserRoleJoinWrapper(SysUserBo user) {
+        return JoinWrappers.lambda("u", SysUser.class)
+            .distinct()
+            .selectAll(SysUser.class)
+            .leftJoin(SysDept.class, "d", SysDept::getDeptId, SysUser::getDeptId)
+            .leftJoin(SysUserRole.class, "sur", SysUserRole::getUserId, SysUser::getUserId)
+            .leftJoin(SysRole.class, "r", SysRole::getRoleId, SysUserRole::getRoleId)
+            .eq("u", SysUser::getDelFlag, SystemConstants.NORMAL)
+            .like(StringUtils.isNotBlank(user.getUserName()), "u", SysUser::getUserName, user.getUserName())
+            .eq(StringUtils.isNotBlank(user.getStatus()), "u", SysUser::getStatus, user.getStatus())
+            .like(StringUtils.isNotBlank(user.getPhonenumber()), "u", SysUser::getPhonenumber, user.getPhonenumber());
+    }
+
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPermissionService.java

@@ -33,8 +33,8 @@ public interface ISysPermissionService {
      * 根据角色列表构建数据权限角色映射
      *
      * @param roles 角色列表
-     * @return key 为权限码 value 为命中的角色列表
+     * @return key 为权限码 value 为命中的角色ID列表
      */
-    Map<String, List<RoleDTO>> getDataScopeRoleMap(List<RoleDTO> roles);
+    Map<String, List<Long>> getDataScopeRoleMap(List<RoleDTO> roles);
 
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java

@@ -61,22 +61,19 @@ public class SysMenuServiceImpl implements ISysMenuService {
      */
     @Override
     public List<SysMenuVo> selectMenuList(SysMenuBo menu, Long userId) {
-        List<SysMenuVo> menuList;
-        LambdaQueryWrapper<SysMenu> wrapper = new LambdaQueryWrapper<>();
         // 管理员显示所有菜单信息 不是管理员 按用户id过滤菜单
-        if (!LoginHelper.isSuperAdmin(userId)) {
-            // 通过用户id获取角色id 通过角色id获取菜单id 然后in菜单
-            wrapper.inSql(SysMenu::getMenuId, baseMapper.buildMenuByUserSql(userId));
+        if (LoginHelper.isSuperAdmin(userId)) {
+            return baseMapper.selectVoList(
+                new LambdaQueryWrapper<SysMenu>()
+                    .like(StringUtils.isNotBlank(menu.getMenuName()), SysMenu::getMenuName, menu.getMenuName())
+                    .eq(StringUtils.isNotBlank(menu.getVisible()), SysMenu::getVisible, menu.getVisible())
+                    .eq(StringUtils.isNotBlank(menu.getStatus()), SysMenu::getStatus, menu.getStatus())
+                    .eq(StringUtils.isNotBlank(menu.getMenuType()), SysMenu::getMenuType, menu.getMenuType())
+                    .eq(ObjectUtil.isNotNull(menu.getParentId()), SysMenu::getParentId, menu.getParentId())
+                    .orderByAsc(SysMenu::getParentId)
+                    .orderByAsc(SysMenu::getOrderNum));
         }
-        menuList = baseMapper.selectVoList(
-            wrapper.like(StringUtils.isNotBlank(menu.getMenuName()), SysMenu::getMenuName, menu.getMenuName())
-                .eq(StringUtils.isNotBlank(menu.getVisible()), SysMenu::getVisible, menu.getVisible())
-                .eq(StringUtils.isNotBlank(menu.getStatus()), SysMenu::getStatus, menu.getStatus())
-                .eq(StringUtils.isNotBlank(menu.getMenuType()), SysMenu::getMenuType, menu.getMenuType())
-                .eq(ObjectUtil.isNotNull(menu.getParentId()), SysMenu::getParentId, menu.getParentId())
-                .orderByAsc(SysMenu::getParentId)
-                .orderByAsc(SysMenu::getOrderNum));
-        return menuList;
+        return baseMapper.selectMenuListByUserId(menu, userId);
     }
 
     /**
@@ -124,13 +121,7 @@ public class SysMenuServiceImpl implements ISysMenuService {
         if (LoginHelper.isSuperAdmin(userId)) {
             menus = baseMapper.selectMenuTreeAll();
         } else {
-            LambdaQueryWrapper<SysMenu> wrapper = new LambdaQueryWrapper<>();
-            menus = baseMapper.selectList(
-                wrapper.in(SysMenu::getMenuType, SystemConstants.TYPE_DIR, SystemConstants.TYPE_MENU)
-                    .eq(SysMenu::getStatus, SystemConstants.NORMAL)
-                    .inSql(SysMenu::getMenuId, baseMapper.buildMenuByUserSql(userId))
-                    .orderByAsc(SysMenu::getParentId)
-                    .orderByAsc(SysMenu::getOrderNum));
+            menus = baseMapper.selectMenuTreeByUserId(userId);
         }
 
         return TreeBuildUtils.build(menus, Constants.TOP_PARENT_ID, SysMenu::getParentId, (menu, nodeTreeMaps) -> {

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPermissionServiceImpl.java

@@ -63,17 +63,16 @@ public class SysPermissionServiceImpl implements ISysPermissionService, Permissi
     }
 
     @Override
-    public Map<String, List<RoleDTO>> getDataScopeRoleMap(List<RoleDTO> roles) {
+    public Map<String, List<Long>> getDataScopeRoleMap(List<RoleDTO> roles) {
         if (CollUtil.isEmpty(roles)) {
             return Map.of();
         }
-        Map<Long, RoleDTO> roleMap = StreamUtils.toIdentityMap(roles, RoleDTO::getRoleId);
         List<Long> roleIds = StreamUtils.toList(roles, RoleDTO::getRoleId);
         Map<Long, Set<String>> permsRoleIds = menuService.selectMenuPermsByRoleIds(roleIds);
-        Map<String, List<RoleDTO>> rolePermsMap = new LinkedHashMap<>();
+        Map<String, List<Long>> rolePermsMap = new LinkedHashMap<>();
         permsRoleIds.forEach((roleId, perms) ->  {
             perms.forEach(perm -> {
-                rolePermsMap.computeIfAbsent(perm, k -> new ArrayList<>()).add(roleMap.get(roleId));
+                rolePermsMap.computeIfAbsent(perm, key -> new ArrayList<>()).add(roleId);
             });
         });
         return rolePermsMap;

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java

@@ -70,20 +70,8 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
      */
     @Override
     public List<SysUserExportVo> selectUserExportList(SysUserBo user) {
-        Map<String, Object> params = user.getParams();
-        QueryWrapper<SysUser> wrapper = Wrappers.query();
-        wrapper.eq("u.del_flag", SystemConstants.NORMAL)
-            .like(StringUtils.isNotBlank(user.getUserName()), "u.user_name", user.getUserName())
-            .like(StringUtils.isNotBlank(user.getNickName()), "u.nick_name", user.getNickName())
-            .eq(StringUtils.isNotBlank(user.getStatus()), "u.status", user.getStatus())
-            .like(StringUtils.isNotBlank(user.getPhonenumber()), "u.phonenumber", user.getPhonenumber())
-            .between(params.get("beginTime") != null && params.get("endTime") != null,
-                "u.create_time", params.get("beginTime"), params.get("endTime"))
-            .and(ObjectUtil.isNotNull(user.getDeptId()), w -> {
-                List<Long> deptIds = deptMapper.selectDeptAndChildById(user.getDeptId());
-                w.in("u.dept_id", deptIds);
-            }).orderByAsc("u.user_id");
-        return baseMapper.selectUserExportList(wrapper);
+        List<Long> deptIds = ObjectUtil.isNotNull(user.getDeptId()) ? deptMapper.selectDeptAndChildById(user.getDeptId()) : null;
+        return baseMapper.selectUserExportList(user, deptIds);
     }
 
     private Wrapper<SysUser> buildQueryWrapper(SysUserBo user) {
@@ -116,14 +104,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
      */
     @Override
     public TableDataInfo<SysUserVo> selectAllocatedList(SysUserBo user, PageQuery pageQuery) {
-        QueryWrapper<SysUser> wrapper = Wrappers.query();
-        wrapper.eq("u.del_flag", SystemConstants.NORMAL)
-            .eq(ObjectUtil.isNotNull(user.getRoleId()), "r.role_id", user.getRoleId())
-            .like(StringUtils.isNotBlank(user.getUserName()), "u.user_name", user.getUserName())
-            .eq(StringUtils.isNotBlank(user.getStatus()), "u.status", user.getStatus())
-            .like(StringUtils.isNotBlank(user.getPhonenumber()), "u.phonenumber", user.getPhonenumber())
-            .orderByAsc("u.user_id");
-        Page<SysUserVo> page = baseMapper.selectAllocatedList(pageQuery.build(), wrapper);
+        Page<SysUserVo> page = baseMapper.selectAllocatedList(pageQuery.build(), user);
         return TableDataInfo.build(page);
     }
 
@@ -136,14 +117,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
     @Override
     public TableDataInfo<SysUserVo> selectUnallocatedList(SysUserBo user, PageQuery pageQuery) {
         List<Long> userIds = userRoleMapper.selectUserIdsByRoleId(user.getRoleId());
-        QueryWrapper<SysUser> wrapper = Wrappers.query();
-        wrapper.eq("u.del_flag", SystemConstants.NORMAL)
-            .and(w -> w.ne("r.role_id", user.getRoleId()).or().isNull("r.role_id"))
-            .notIn(CollUtil.isNotEmpty(userIds), "u.user_id", userIds)
-            .like(StringUtils.isNotBlank(user.getUserName()), "u.user_name", user.getUserName())
-            .like(StringUtils.isNotBlank(user.getPhonenumber()), "u.phonenumber", user.getPhonenumber())
-            .orderByAsc("u.user_id");
-        Page<SysUserVo> page = baseMapper.selectUnallocatedList(pageQuery.build(), wrapper);
+        Page<SysUserVo> page = baseMapper.selectUnallocatedList(pageQuery.build(), user, userIds);
         return TableDataInfo.build(page);
     }
 

ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -4,39 +4,4 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.dromara.system.mapper.SysUserMapper">
 
-    <resultMap type="org.dromara.system.domain.vo.SysUserVo" id="SysUserResult">
-        <id property="userId" column="user_id"/>
-    </resultMap>
-    <resultMap type="org.dromara.system.domain.vo.SysUserExportVo" id="SysUserExportResult">
-        <id property="userId" column="user_id"/>
-    </resultMap>
-
-    <select id="selectUserExportList" resultMap="SysUserExportResult">
-        select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex,
-            u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
-            d.dept_name, d.leader, u1.user_name as leaderName
-        from sys_user u
-            left join sys_dept d on u.dept_id = d.dept_id
-            left join sys_user u1 on u1.user_id = d.leader
-        ${ew.getCustomSqlSegment}
-    </select>
-
-    <select id="selectAllocatedList" resultMap="SysUserResult">
-        select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
-        from sys_user u
-             left join sys_dept d on u.dept_id = d.dept_id
-             left join sys_user_role sur on u.user_id = sur.user_id
-             left join sys_role r on r.role_id = sur.role_id
-        ${ew.getCustomSqlSegment}
-    </select>
-
-    <select id="selectUnallocatedList" resultMap="SysUserResult">
-        select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
-        from sys_user u
-             left join sys_dept d on u.dept_id = d.dept_id
-             left join sys_user_role sur on u.user_id = sur.user_id
-             left join sys_role r on r.role_id = sur.role_id
-        ${ew.getCustomSqlSegment}
-    </select>
-
 </mapper>