From 175a02f49c654f802187a6aabcedf202428bbc7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Mon, 30 Mar 2026 15:21:37 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20distinct=20=E5=9C=A8?= =?UTF-8?q?=20sqlserver=20=E4=B8=AD=E7=9A=84=E9=99=90=E5=88=B6=20=E8=A1=A5?= =?UTF-8?q?=E7=BC=BA=E6=8E=92=E5=BA=8F=E5=AD=97=E6=AE=B5=20=E7=A1=AE?= =?UTF-8?q?=E4=BF=9D=E8=AF=AD=E6=B3=95=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/dromara/system/mapper/SysDeptMapper.java | 2 +- .../src/main/java/org/dromara/system/mapper/SysMenuMapper.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 f9dccb559..5777e6a90 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 @@ -104,7 +104,7 @@ public interface SysDeptMapper extends BaseMapperPlus, MPJBa default List selectDeptListByRoleId(Long roleId, boolean deptCheckStrictly) { List depts = this.selectJoinList(SysDept.class, JoinWrappers.lambda("d", SysDept.class) .distinct() - .select(SysDept::getDeptId, SysDept::getParentId) + .select(SysDept::getDeptId, SysDept::getParentId, SysDept::getOrderNum) .leftJoin(SysRoleDept.class, "srd", SysRoleDept::getDeptId, SysDept::getDeptId) .leftJoin(SysRole.class, "sr", SysRole::getRoleId, SysRoleDept::getRoleId) .eq("srd", SysRoleDept::getRoleId, roleId) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysMenuMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysMenuMapper.java index a587b087a..a51b1352a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysMenuMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysMenuMapper.java @@ -115,7 +115,7 @@ public interface SysMenuMapper extends BaseMapperPlus, MPJBa default List selectMenuListByRoleId(Long roleId, boolean menuCheckStrictly) { List menus = this.selectJoinList(SysMenu.class, JoinWrappers.lambda("m", SysMenu.class) .distinct() - .select(SysMenu::getMenuId, SysMenu::getParentId) + .select(SysMenu::getMenuId, SysMenu::getParentId, SysMenu::getOrderNum) .leftJoin(SysRoleMenu.class, "srm", SysRoleMenu::getMenuId, SysMenu::getMenuId) .leftJoin(SysRole.class, "sr", SysRole::getRoleId, SysRoleMenu::getRoleId) .eq("srm", SysRoleMenu::getRoleId, roleId)