public/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-04-02 16:53:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix 修复 distinct 在 sqlserver 中的限制 补缺排序字段 确保语法正确

Browse Source
This commit is contained in:
疯狂的狮子Li
2026-03-30 15:21:37 +08:00
parent a57694bdff
commit 175a02f49c
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -104,7 +104,7 @@ public interface SysDeptMapper extends BaseMapperPlus<SysDept, SysDeptVo>, MPJBa
default List<Long> selectDeptListByRoleId(Long roleId, boolean deptCheckStrictly) { default List<Long> selectDeptListByRoleId(Long roleId, boolean deptCheckStrictly) {
List<SysDept> depts = this.selectJoinList(SysDept.class, JoinWrappers.lambda("d", SysDept.class) List<SysDept> depts = this.selectJoinList(SysDept.class, JoinWrappers.lambda("d", SysDept.class)
.distinct() .distinct()
.select(SysDept::getDeptId, SysDept::getParentId) .select(SysDept::getDeptId, SysDept::getParentId, SysDept::getOrderNum)
.leftJoin(SysRoleDept.class, "srd", SysRoleDept::getDeptId, SysDept::getDeptId) .leftJoin(SysRoleDept.class, "srd", SysRoleDept::getDeptId, SysDept::getDeptId)
.leftJoin(SysRole.class, "sr", SysRole::getRoleId, SysRoleDept::getRoleId) .leftJoin(SysRole.class, "sr", SysRole::getRoleId, SysRoleDept::getRoleId)
.eq("srd", SysRoleDept::getRoleId, roleId) .eq("srd", SysRoleDept::getRoleId, roleId)

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

@@ -115,7 +115,7 @@ public interface SysMenuMapper extends BaseMapperPlus<SysMenu, SysMenuVo>, MPJBa
default List<Long> selectMenuListByRoleId(Long roleId, boolean menuCheckStrictly) { default List<Long> selectMenuListByRoleId(Long roleId, boolean menuCheckStrictly) {
List<SysMenu> menus = this.selectJoinList(SysMenu.class, JoinWrappers.lambda("m", SysMenu.class) List<SysMenu> menus = this.selectJoinList(SysMenu.class, JoinWrappers.lambda("m", SysMenu.class)
.distinct() .distinct()
.select(SysMenu::getMenuId, SysMenu::getParentId) .select(SysMenu::getMenuId, SysMenu::getParentId, SysMenu::getOrderNum)
.leftJoin(SysRoleMenu.class, "srm", SysRoleMenu::getMenuId, SysMenu::getMenuId) .leftJoin(SysRoleMenu.class, "srm", SysRoleMenu::getMenuId, SysMenu::getMenuId)
.leftJoin(SysRole.class, "sr", SysRole::getRoleId, SysRoleMenu::getRoleId) .leftJoin(SysRole.class, "sr", SysRole::getRoleId, SysRoleMenu::getRoleId)
.eq("srm", SysRoleMenu::getRoleId, roleId) .eq("srm", SysRoleMenu::getRoleId, roleId)